From 5c2239fef8a7f2e3f819644f7418fce9db1acb35 Mon Sep 17 00:00:00 2001 From: rusirijayodaillesinghe Date: Thu, 25 May 2023 12:55:51 +0530 Subject: [PATCH 01/16] Fix error thrown when click on a document created without the content fixes https://github.com/wso2/api-manager/issues/1866 --- .../wso2/carbon/apimgt/impl/AbstractAPIManager.java | 4 ---- .../publisher/v1/impl/ApiProductsApiServiceImpl.java | 2 +- .../api/publisher/v1/impl/ApisApiServiceImpl.java | 2 +- .../rest/api/store/v1/impl/ApisApiServiceImpl.java | 2 +- .../apimgt/rest/api/util/utils/RestApiUtil.java | 12 ++++++++++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/AbstractAPIManager.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/AbstractAPIManager.java index 367765623b04..bc08ab5c9744 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/AbstractAPIManager.java +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/AbstractAPIManager.java @@ -472,10 +472,6 @@ public DocumentationContent getDocumentationContent(String apiId, String docId, DocumentationContent docContent = null; if (content != null) { docContent = DocumentMapper.INSTANCE.toDocumentationContent(content); - } else { - String msg = "Failed to get the document content. Artifact corresponding to document id " + docId - + " does not exist"; - throw new APIMgtResourceNotFoundException(msg); } return docContent; } catch (DocumentationPersistenceException e) { diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/impl/ApiProductsApiServiceImpl.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/impl/ApiProductsApiServiceImpl.java index 4ca18693fd77..864b5b772433 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/impl/ApiProductsApiServiceImpl.java +++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/impl/ApiProductsApiServiceImpl.java @@ -141,7 +141,7 @@ public Response getAPIProductDocumentContent(String apiProductId, //documentation = apiProvider.getProductDocumentation(documentId, tenantDomain); DocumentationContent docContent = apiProvider.getDocumentationContent(apiProductId, documentId, organization); if (docContent == null) { - RestApiUtil.handleResourceNotFoundError(RestApiConstants.RESOURCE_PRODUCT_DOCUMENTATION, documentId, log); + RestApiUtil.handleResourceNotFoundError(RestApiConstants.RESOURCE_PRODUCT_DOCUMENTATION, documentId); return null; } diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/impl/ApisApiServiceImpl.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/impl/ApisApiServiceImpl.java index af91e3f897d6..6d212223957f 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/impl/ApisApiServiceImpl.java +++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/impl/ApisApiServiceImpl.java @@ -1243,7 +1243,7 @@ public Response getAPIDocumentContentByDocumentId(String apiId, String documentI DocumentationContent docContent = apiProvider.getDocumentationContent(apiId, documentId, organization); if (docContent == null) { - RestApiUtil.handleResourceNotFoundError(RestApiConstants.RESOURCE_DOCUMENTATION, documentId, log); + RestApiUtil.handleResourceNotFoundError(RestApiConstants.RESOURCE_DOCUMENTATION, documentId); return null; } diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java index 5bc3fd3f78de..1b73b466d5cd 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java +++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApisApiServiceImpl.java @@ -504,7 +504,7 @@ public Response apisApiIdDocumentsDocumentIdContentGet(String apiId, String docu DocumentationContent docContent = apiConsumer.getDocumentationContent(apiId, documentId, organization); if (docContent == null) { - RestApiUtil.handleResourceNotFoundError(RestApiConstants.RESOURCE_DOCUMENTATION, documentId, log); + RestApiUtil.handleResourceNotFoundError(RestApiConstants.RESOURCE_DOCUMENTATION, documentId); return null; } diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/src/main/java/org/wso2/carbon/apimgt/rest/api/util/utils/RestApiUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/src/main/java/org/wso2/carbon/apimgt/rest/api/util/utils/RestApiUtil.java index 9b1ca826d033..4ae5500fc92e 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/src/main/java/org/wso2/carbon/apimgt/rest/api/util/utils/RestApiUtil.java +++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/src/main/java/org/wso2/carbon/apimgt/rest/api/util/utils/RestApiUtil.java @@ -779,6 +779,18 @@ public static void handleResourceNotFoundError(String resource, String id, Log l throw notFoundException; } + /** + * Builds a NotFoundException with specified details and throws it + * + * @param resource requested resource + * @param id id of resource + * @throws NotFoundException + */ + public static void handleResourceNotFoundError(String resource, String id) { + NotFoundException notFoundException = buildNotFoundException(resource, id); + throw notFoundException; + } + /** * Logs the error, builds a NotFoundException with specified details and throws it * From 769a88c6cfc5f38695fdb56a03d88fe6b705e468 Mon Sep 17 00:00:00 2001 From: rusirijayodaillesinghe Date: Thu, 1 Jun 2023 17:13:25 +0530 Subject: [PATCH 02/16] Add a default version_comparable value to fix error thrown in APIs migrated from the version which doesn't support API Revisions --- .../persistence/RegistryPersistenceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/RegistryPersistenceImpl.java b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/RegistryPersistenceImpl.java index 592f35637c04..0cc659cff912 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/RegistryPersistenceImpl.java +++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/RegistryPersistenceImpl.java @@ -350,6 +350,8 @@ public void restoreAPIRevision(Organization org, String apiUUID, String revision GenericArtifact apiArtifact = artifactManager.getGenericArtifact(apiUUID); String lcState = ((GenericArtifactImpl) apiArtifact).getLcState(); if (apiArtifact != null) { + String existingVersionComparable = apiArtifact.getAttribute(APIConstants + .API_OVERVIEW_VERSION_COMPARABLE); API api = RegistryPersistenceUtil.getApiForPublishing(registry, apiArtifact); String visibleRolesList = api.getVisibleRoles(); String[] visibleRoles = new String[0]; @@ -370,6 +372,18 @@ public void restoreAPIRevision(Organization org, String apiUUID, String revision ((UserRegistry) registry).getTenantId()); RegistryPersistenceUtil.setResourcePermissions(api.getId().getProviderName(), api.getVisibility(), visibleRoles, apiPath); + GenericArtifact newArtifact = artifactManager.getGenericArtifact(apiUUID); + if (newArtifact != null && newArtifact.getAttribute(APIConstants.API_OVERVIEW_VERSION_COMPARABLE) + == null) { + if (existingVersionComparable != null) { + newArtifact.setAttribute(APIConstants.API_OVERVIEW_VERSION_COMPARABLE + , existingVersionComparable); + } else { + newArtifact.setAttribute(APIConstants.API_OVERVIEW_VERSION_COMPARABLE + , String.valueOf(System.currentTimeMillis())); + } + artifactManager.updateGenericArtifact(newArtifact); + } } registry.commitTransaction(); transactionCommitted = true; From 6a344933ce450943248ada46fbcf5d1091df7cf9 Mon Sep 17 00:00:00 2001 From: rusirijayodaillesinghe Date: Fri, 2 Jun 2023 09:57:35 +0530 Subject: [PATCH 03/16] Fix formatting issues --- .../apimgt/persistence/RegistryPersistenceImpl.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/RegistryPersistenceImpl.java b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/RegistryPersistenceImpl.java index 0cc659cff912..e04e155f5e57 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/RegistryPersistenceImpl.java +++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/RegistryPersistenceImpl.java @@ -373,14 +373,12 @@ public void restoreAPIRevision(Organization org, String apiUUID, String revision RegistryPersistenceUtil.setResourcePermissions(api.getId().getProviderName(), api.getVisibility(), visibleRoles, apiPath); GenericArtifact newArtifact = artifactManager.getGenericArtifact(apiUUID); - if (newArtifact != null && newArtifact.getAttribute(APIConstants.API_OVERVIEW_VERSION_COMPARABLE) - == null) { + if (newArtifact != null && newArtifact.getAttribute(APIConstants.API_OVERVIEW_VERSION_COMPARABLE) == null) { if (existingVersionComparable != null) { - newArtifact.setAttribute(APIConstants.API_OVERVIEW_VERSION_COMPARABLE - , existingVersionComparable); + newArtifact.setAttribute(APIConstants.API_OVERVIEW_VERSION_COMPARABLE, existingVersionComparable); } else { - newArtifact.setAttribute(APIConstants.API_OVERVIEW_VERSION_COMPARABLE - , String.valueOf(System.currentTimeMillis())); + newArtifact.setAttribute(APIConstants.API_OVERVIEW_VERSION_COMPARABLE, + String.valueOf(System.currentTimeMillis())); } artifactManager.updateGenericArtifact(newArtifact); } From a29c20e75ce3b4c4c948afbe5b99cc7465119db6 Mon Sep 17 00:00:00 2001 From: shnrndk Date: Thu, 25 May 2023 08:52:38 +0530 Subject: [PATCH 04/16] fixed failover enabled in params.yaml appear as disabled in publisher portal. (cherry picked from commit a114174d1ebf810e359d83a72943eb404c9586af) --- .../api/publisher/v1/common/mappings/APIControllerUtil.java | 5 +++++ 1 file changed, 5 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/APIControllerUtil.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/APIControllerUtil.java index 2663021e20cd..3e4a1d7688e5 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/APIControllerUtil.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/APIControllerUtil.java @@ -641,6 +641,7 @@ private static JsonObject handleRestEndpoints(String routingPolicy, JsonObject e //get load balanced configs from params JsonElement loadBalancedConfigElement = envParams.get(ImportExportConstants.LOAD_BALANCE_ENDPOINTS_FIELD); + JsonElement failOverConfigElement = envParams.get(ImportExportConstants.FAILOVER_TYPE_ENDPOINT); JsonObject loadBalancedConfigs; if (loadBalancedConfigElement == null) { throw new APIManagementException( @@ -649,6 +650,10 @@ private static JsonObject handleRestEndpoints(String routingPolicy, JsonObject e } else { loadBalancedConfigs = loadBalancedConfigElement.getAsJsonObject(); } + if (failOverConfigElement != null) { + updatedRESTEndpointParams.addProperty(ImportExportConstants.FAILOVER_TYPE_ENDPOINT, + failOverConfigElement.getAsBoolean()); + } updatedRESTEndpointParams.addProperty(ImportExportConstants.ENDPOINT_TYPE_PROPERTY, ImportExportConstants.LOAD_BALANCE_TYPE_ENDPOINT); updatedRESTEndpointParams.addProperty(ImportExportConstants.LOAD_BALANCE_ALGORITHM_CLASS_PROPERTY, From 196c01c8de4d739a607a9d89805f329970f49e85 Mon Sep 17 00:00:00 2001 From: shnrndk Date: Wed, 31 May 2023 10:04:04 +0530 Subject: [PATCH 05/16] fixed colon can't include in the password issue (cherry picked from commit b032d680a381de3b123b6cb98e3275b71f5f3fbc) --- .../handlers/security/basicauth/BasicAuthAuthenticator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/basicauth/BasicAuthAuthenticator.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/basicauth/BasicAuthAuthenticator.java index bc7c0c421169..e711a2cb5958 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/basicauth/BasicAuthAuthenticator.java +++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/basicauth/BasicAuthAuthenticator.java @@ -264,7 +264,7 @@ private String[] extractBasicAuthCredentials(String basicAuthHeader) throws APIS String basicAuthKey = new String(Base64.decode( basicAuthHeader.substring(basicAuthKeyHeaderSegment.length() + 1).trim())); if (basicAuthKey.contains(":")) { - return basicAuthKey.split(":"); + return basicAuthKey.split(":", 2); } else { log.error("Basic Authentication: Invalid Basic Auth token"); throw new APISecurityException(APISecurityConstants.API_AUTH_INVALID_CREDENTIALS, From 0349382c1e29e7bbe6018e4f0aef99a0ac233463 Mon Sep 17 00:00:00 2001 From: Savindu Dimal Date: Mon, 29 May 2023 16:24:35 +0530 Subject: [PATCH 06/16] Change retry logic for internal api calls --- .../apimgt/gateway/APILoggerManager.java | 41 ++++------------ .../gateway/EndpointCertificateDeployer.java | 2 +- .../GoogleAnalyticsConfigDeployer.java | 2 +- .../jwt/RevokedJWTTokensRetriever.java | 37 +++++--------- .../util/BlockingConditionRetriever.java | 45 +++++------------ .../throttling/util/KeyTemplateRetriever.java | 45 +++++------------ .../carbon/apimgt/impl/utils/APIUtil.java | 10 ++-- .../impl/SubscriptionDataLoaderImpl.java | 48 ++++--------------- .../policy/deployer/PolicyRetriever.java | 2 +- 9 files changed, 61 insertions(+), 171 deletions(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/APILoggerManager.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/APILoggerManager.java index 5d6ba4cda400..2c2e67fe2f92 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/APILoggerManager.java +++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/APILoggerManager.java @@ -21,9 +21,8 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.util.EntityUtils; import org.json.JSONArray; @@ -49,8 +48,6 @@ public class APILoggerManager { private static final Map logProperties = new HashMap<>(); private static final APILoggerManager apiLoggerManager = new APILoggerManager(); private final EventHubConfigurationDto eventHubConfigurationDto; - public static final int RETRIEVAL_RETRIES = 15; - public static final int RETRIEVAL_TIMEOUT_IN_SECONDS = 15; public static final String UTF8 = "UTF-8"; public void initializeAPILoggerList() { @@ -110,35 +107,13 @@ private String invokeService(String path, String tenantDomain) throws IOExceptio method.setHeader(APIConstants.HEADER_TENANT, tenantDomain); } HttpClient httpClient = APIUtil.getHttpClient(servicePort, serviceProtocol); - - HttpResponse httpResponse = null; - int retryCount = 0; - boolean retry; - do { - try { - httpResponse = httpClient.execute(method); - retry = false; - } catch (IOException ex) { - retryCount++; - if (retryCount < RETRIEVAL_RETRIES) { - retry = true; - log.warn("Failed retrieving " + path + " from remote endpoint: " + ex.getMessage() - + ". Retrying after " + RETRIEVAL_TIMEOUT_IN_SECONDS + - " seconds."); - try { - Thread.sleep(RETRIEVAL_TIMEOUT_IN_SECONDS * 1000L); - } catch (InterruptedException e) { - // Ignore - } - } else { - throw new APIManagementException("Error while calling internal service", ex); - } - } - } while (retry); - if (HttpStatus.SC_OK != httpResponse.getStatusLine().getStatusCode()) { - log.error("Could not retrieve subscriptions for tenantDomain : " + tenantDomain); - throw new APIManagementException("Error while retrieving subscription from " + path); + try (CloseableHttpResponse httpResponse = APIUtil.executeHTTPRequestWithRetries(method, httpClient)){ + return EntityUtils.toString(httpResponse.getEntity(), UTF8); + } catch (APIManagementException e) { + throw new APIManagementException("Error while calling internal service", e); } - return EntityUtils.toString(httpResponse.getEntity(), UTF8); + + + } } diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/EndpointCertificateDeployer.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/EndpointCertificateDeployer.java index 7cf721d2c71b..af0991c33819 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/EndpointCertificateDeployer.java +++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/EndpointCertificateDeployer.java @@ -132,7 +132,7 @@ private CloseableHttpResponse invokeService(String endpoint, String tenantDomain HttpClient httpClient = APIUtil.getHttpClient(port, protocol); try { - return APIUtil.executeHTTPRequest(method, httpClient); + return APIUtil.executeHTTPRequestWithRetries(method, httpClient); } catch (APIManagementException e) { throw new ArtifactSynchronizerException(e); } diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/GoogleAnalyticsConfigDeployer.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/GoogleAnalyticsConfigDeployer.java index e89037c919aa..4167bc90c032 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/GoogleAnalyticsConfigDeployer.java +++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/GoogleAnalyticsConfigDeployer.java @@ -118,7 +118,7 @@ private CloseableHttpResponse invokeService(String endpoint, String tenantDomain HttpClient httpClient = APIUtil.getHttpClient(port, protocol); try { - return APIUtil.executeHTTPRequest(method, httpClient); + return APIUtil.executeHTTPRequestWithRetries(method, httpClient); } catch (APIManagementException e) { throw new ArtifactSynchronizerException(e); } diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/jwt/RevokedJWTTokensRetriever.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/jwt/RevokedJWTTokensRetriever.java index 4fca13495583..63fa846f0b9f 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/jwt/RevokedJWTTokensRetriever.java +++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/jwt/RevokedJWTTokensRetriever.java @@ -22,14 +22,16 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.util.EntityUtils; +import org.wso2.carbon.apimgt.api.APIManagementException; import org.wso2.carbon.apimgt.gateway.dto.RevokedJWTTokenDTO; import org.wso2.carbon.apimgt.gateway.internal.ServiceReferenceHolder; import org.wso2.carbon.apimgt.impl.APIConstants; import org.wso2.carbon.apimgt.impl.dto.EventHubConfigurationDto; +import org.wso2.carbon.apimgt.impl.gatewayartifactsynchronizer.exception.DataLoadingException; import org.wso2.carbon.apimgt.impl.utils.APIUtil; import java.io.IOException; @@ -38,14 +40,14 @@ import java.util.Timer; import java.util.TimerTask; +import static org.wso2.carbon.apimgt.impl.APIConstants.DigestAuthConstants.CHARSET; + /** * Class which is responsible to fetch the revoked JWT signatures via webservice database during startup */ public class RevokedJWTTokensRetriever extends TimerTask { private static final Log log = LogFactory.getLog(RevokedJWTTokensRetriever.class); - private static final int revokedJWTTokensRetrievalTimeoutInSeconds = 15; - private static final int revokedJWTTokensRetrievalRetries = 15; @Override public void run() { @@ -73,32 +75,17 @@ private RevokedJWTTokenDTO[] retrieveRevokedJWTTokensData() { int keyMgtPort = keyMgtURL.getPort(); String keyMgtProtocol = keyMgtURL.getProtocol(); HttpClient httpClient = APIUtil.getHttpClient(keyMgtPort, keyMgtProtocol); - HttpResponse httpResponse = null; - int retryCount = 0; - boolean retry; - do { - try { - httpResponse = httpClient.execute(method); - retry = false; - } catch (IOException ex) { - retryCount++; - if (retryCount < revokedJWTTokensRetrievalRetries) { - retry = true; - log.warn("Failed retrieving revoked JWT token signatures from remote endpoint: " + - ex.getMessage() + ". Retrying after " + revokedJWTTokensRetrievalTimeoutInSeconds + - " seconds..."); - Thread.sleep(revokedJWTTokensRetrievalTimeoutInSeconds * 1000); - } else { - throw ex; - } - } - } while (retry); + String responseString; + try (CloseableHttpResponse httpResponse = APIUtil.executeHTTPRequestWithRetries(method, httpClient)) { + responseString = EntityUtils.toString(httpResponse.getEntity(), CHARSET); + } catch (APIManagementException e) { + throw new DataLoadingException("Error while retrieving revoked JWT tokens", e); + } - String responseString = EntityUtils.toString(httpResponse.getEntity(), "UTF-8"); if (responseString != null && !responseString.isEmpty()) { return new Gson().fromJson(responseString, RevokedJWTTokenDTO[].class); } - } catch (IOException | InterruptedException e) { + } catch (IOException | DataLoadingException e) { log.error("Exception when retrieving revoked JWT tokens from remote endpoint ", e); } return null; diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/throttling/util/BlockingConditionRetriever.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/throttling/util/BlockingConditionRetriever.java index 9d0e7b6a45c0..a302e7ba9c60 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/throttling/util/BlockingConditionRetriever.java +++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/throttling/util/BlockingConditionRetriever.java @@ -21,16 +21,18 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.util.EntityUtils; +import org.wso2.carbon.apimgt.api.APIManagementException; import org.wso2.carbon.apimgt.gateway.dto.BlockConditionsDTO; import org.wso2.carbon.apimgt.gateway.internal.ServiceReferenceHolder; import org.wso2.carbon.apimgt.gateway.throttling.ThrottleDataHolder; import org.wso2.carbon.apimgt.gateway.utils.GatewayUtils; import org.wso2.carbon.apimgt.impl.APIConstants; import org.wso2.carbon.apimgt.impl.dto.EventHubConfigurationDto; +import org.wso2.carbon.apimgt.impl.gatewayartifactsynchronizer.exception.DataLoadingException; import org.wso2.carbon.apimgt.impl.utils.APIUtil; import java.io.IOException; @@ -39,10 +41,10 @@ import java.util.Timer; import java.util.TimerTask; +import static org.wso2.carbon.apimgt.impl.APIConstants.DigestAuthConstants.CHARSET; + public class BlockingConditionRetriever extends TimerTask { private static final Log log = LogFactory.getLog(BlockingConditionRetriever.class); - private static final int blockConditionsDataRetrievalTimeoutInSeconds = 15; - private static final int blockConditionsDataRetrievalRetries = 15; @Override public void run() { @@ -71,40 +73,17 @@ private BlockConditionsDTO retrieveBlockConditionsData() { int keyMgtPort = eventHubUrl.getPort(); String protocol = eventHubUrl.getProtocol(); HttpClient httpClient = APIUtil.getHttpClient(keyMgtPort, protocol); - HttpResponse httpResponse = null; - int retryCount = 0; - boolean retry = true; - do { - try { - httpResponse = httpClient.execute(method); - if (httpResponse.getStatusLine().getStatusCode() == 200) { - retry = false; - } - } catch (IOException ex) { - if (retryCount >= blockConditionsDataRetrievalRetries) { - throw ex; - }else{ - log.warn("Failed retrieving Blocking Conditions from remote endpoint: " + ex.getMessage() - + ". Retrying after " + blockConditionsDataRetrievalTimeoutInSeconds + " seconds..."); } - } - if (retry) { - if (retryCount < blockConditionsDataRetrievalRetries) { - log.warn("Failed retrieving Blocking Conditions from remote endpoint:. Retrying after " - + blockConditionsDataRetrievalTimeoutInSeconds + " seconds..."); - Thread.sleep(blockConditionsDataRetrievalTimeoutInSeconds * 1000); - } else { - retry = false; - } - retryCount++; - } - - } while (retry); + String responseString; + try (CloseableHttpResponse httpResponse = APIUtil.executeHTTPRequestWithRetries(method, httpClient)) { + responseString = EntityUtils.toString(httpResponse.getEntity(), CHARSET); + } catch (APIManagementException e) { + throw new DataLoadingException("Error while retrieving Blocking Conditions", e); + } - String responseString = EntityUtils.toString(httpResponse.getEntity(), "UTF-8"); if (responseString != null && !responseString.isEmpty()) { return new Gson().fromJson(responseString, BlockConditionsDTO.class); } - } catch (IOException | InterruptedException e) { + } catch (IOException | DataLoadingException e) { log.error("Exception when retrieving Blocking Conditions from remote endpoint ", e); } return null; diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/throttling/util/KeyTemplateRetriever.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/throttling/util/KeyTemplateRetriever.java index 137164973022..99646ae0f2e2 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/throttling/util/KeyTemplateRetriever.java +++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/throttling/util/KeyTemplateRetriever.java @@ -20,18 +20,20 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.util.EntityUtils; import org.json.simple.JSONArray; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; +import org.wso2.carbon.apimgt.api.APIManagementException; import org.wso2.carbon.apimgt.gateway.internal.ServiceReferenceHolder; import org.wso2.carbon.apimgt.gateway.throttling.ThrottleDataHolder; import org.wso2.carbon.apimgt.gateway.utils.GatewayUtils; import org.wso2.carbon.apimgt.impl.APIConstants; import org.wso2.carbon.apimgt.impl.dto.EventHubConfigurationDto; +import org.wso2.carbon.apimgt.impl.gatewayartifactsynchronizer.exception.DataLoadingException; import org.wso2.carbon.apimgt.impl.utils.APIUtil; import java.io.IOException; @@ -42,10 +44,10 @@ import java.util.Timer; import java.util.TimerTask; +import static org.wso2.carbon.apimgt.impl.APIConstants.DigestAuthConstants.CHARSET; + public class KeyTemplateRetriever extends TimerTask { private static final Log log = LogFactory.getLog(KeyTemplateRetriever.class); - private static final int keyTemplateRetrievalTimeoutInSeconds = 15; - private static final int keyTemplateRetrievalRetries = 15; @Override public void run() { @@ -75,36 +77,13 @@ private String[] retrieveKeyTemplateData() { int keyMgtPort = keyMgtURL.getPort(); String keyMgtProtocol = keyMgtURL.getProtocol(); HttpClient httpClient = APIUtil.getHttpClient(keyMgtPort, keyMgtProtocol); - HttpResponse httpResponse = null; - int retryCount = 0; - boolean retry = true; - do { - try { - httpResponse = httpClient.execute(method); - if (httpResponse.getStatusLine().getStatusCode() == 200) { - retry = false; - } - } catch (IOException ex) { - if (retryCount >= keyTemplateRetrievalRetries) { - throw ex; - }else{ - log.warn("Failed retrieving throttling data from remote endpoint: " + ex.getMessage() - + ". Retrying after " + keyTemplateRetrievalTimeoutInSeconds + " seconds..."); - } - } - if (retry) { - if (retryCount < keyTemplateRetrievalRetries) { - log.warn("Failed retrieving throttling data from remote endpoint. Retrying after " - + keyTemplateRetrievalTimeoutInSeconds + " seconds..."); - Thread.sleep(keyTemplateRetrievalTimeoutInSeconds * 1000); - } else { - retry = false; - } - retryCount++; - } - } while (retry); + String responseString; + try (CloseableHttpResponse httpResponse = APIUtil.executeHTTPRequestWithRetries(method, httpClient)) { + responseString = EntityUtils.toString(httpResponse.getEntity(), CHARSET); + } catch (APIManagementException e) { + throw new DataLoadingException("Error while retrieving throttling data", e); + } - String responseString = EntityUtils.toString(httpResponse.getEntity(), "UTF-8"); if (responseString != null && !responseString.isEmpty()) { Object jsonObject = new JSONParser().parse(responseString); if (jsonObject instanceof JSONArray) { @@ -114,7 +93,7 @@ private String[] retrieveKeyTemplateData() { log.error("Invalid throttling data response: " + responseString); } } - } catch (IOException | InterruptedException | ParseException e) { + } catch (IOException | ParseException | DataLoadingException e) { log.error("Exception when retrieving throttling data from remote endpoint ", e); } return null; 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 9612120a4e09..6357ab25f873 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 @@ -490,6 +490,7 @@ public static CloseableHttpResponse executeHTTPRequestWithRetries(HttpRequestBas throws IOException, APIManagementException { CloseableHttpResponse httpResponse = null; + String path = method.getURI().getPath(); long retryDuration = retrievalTimeout; int retryCount = 0; boolean retry; @@ -497,15 +498,16 @@ public static CloseableHttpResponse executeHTTPRequestWithRetries(HttpRequestBas try { httpResponse = (CloseableHttpResponse) httpClient.execute(method); if (HttpStatus.SC_OK != httpResponse.getStatusLine().getStatusCode()) { - throw new DataLoadingException("Error while retrieving artifacts. " - + "Received response with status code "+ httpResponse.getStatusLine().getStatusCode()); + throw new DataLoadingException("Error while retrieving " + + path + ". Received response with status code " + + httpResponse.getStatusLine().getStatusCode()); } retry = false; } catch (IOException | DataLoadingException ex) { retryCount++; if (retryCount <= maxRetryCount) { retry = true; - log.error("Failed to retrieve from remote endpoint: " + ex.getMessage() + log.error("Failed to retrieve " + path + " from remote endpoint: " + ex.getMessage() + ". Retry attempt " + retryCount + " in " + (retryDuration / 1000) + " seconds."); try { @@ -518,7 +520,7 @@ public static CloseableHttpResponse executeHTTPRequestWithRetries(HttpRequestBas // Ignore } } else { - log.error("Failed to retrieve from remote endpoint. Maximum retry count exceeded." + log.error("Failed to retrieve " + path + " from remote endpoint. Maximum retry count exceeded." + ex.getMessage()); throw ex; } diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/src/main/java/org/wso2/carbon/apimgt/keymgt/model/impl/SubscriptionDataLoaderImpl.java b/components/apimgt/org.wso2.carbon.apimgt.keymgt/src/main/java/org/wso2/carbon/apimgt/keymgt/model/impl/SubscriptionDataLoaderImpl.java index c52dadf37b38..c9d25dbca0a8 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.keymgt/src/main/java/org/wso2/carbon/apimgt/keymgt/model/impl/SubscriptionDataLoaderImpl.java +++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt/src/main/java/org/wso2/carbon/apimgt/keymgt/model/impl/SubscriptionDataLoaderImpl.java @@ -21,11 +21,11 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.util.EntityUtils; +import org.wso2.carbon.apimgt.api.APIManagementException; import org.wso2.carbon.apimgt.impl.APIConstants; import org.wso2.carbon.apimgt.impl.dto.EventHubConfigurationDto; import org.wso2.carbon.apimgt.impl.dto.GatewayArtifactSynchronizerProperties; @@ -64,8 +64,6 @@ public class SubscriptionDataLoaderImpl implements SubscriptionDataLoader { private static final Log log = LogFactory.getLog(SubscriptionDataLoaderImpl.class); private EventHubConfigurationDto getEventHubConfigurationDto; private GatewayArtifactSynchronizerProperties gatewayArtifactSynchronizerProperties; - public static final int retrievalTimeoutInSeconds = 15; - public static final int retrievalRetries = 15; public static final String UTF8 = "UTF-8"; public SubscriptionDataLoaderImpl() { @@ -468,47 +466,17 @@ private String invokeService(String path, String tenantDomain) throws DataLoadin method.setHeader(APIConstants.HEADER_TENANT, tenantDomain); } HttpClient httpClient = APIUtil.getHttpClient(servicePort, serviceProtocol); - - HttpResponse httpResponse = null; - int retryCount = 0; - boolean retry = false; - do { - try { - httpResponse = httpClient.execute(method); - if (HttpStatus.SC_OK != httpResponse.getStatusLine().getStatusCode()) { - log.error("Could not retrieve subscriptions for tenantDomain: " + tenantDomain - + ". Received response with status code " - + httpResponse.getStatusLine().getStatusCode()); - throw new DataLoadingException("Error while retrieving subscription"); - } - retry = false; - } catch (IOException | DataLoadingException ex) { - retryCount++; - if (retryCount < retrievalRetries) { - retry = true; - log.warn("Failed retrieving " + path + " from remote endpoint: " + ex.getMessage() - + ". Retrying after " + retrievalTimeoutInSeconds + - " seconds."); - try { - Thread.sleep(retrievalTimeoutInSeconds * 1000); - } catch (InterruptedException e) { - // Ignore - } - } else { - throw ex; - } - } - } while (retry); - if (HttpStatus.SC_OK != httpResponse.getStatusLine().getStatusCode()) { - log.error("Could not retrieve subscriptions for tenantDomain : " + tenantDomain); - throw new DataLoadingException("Error while retrieving subscription from " + path); + String responseString; + try (CloseableHttpResponse httpResponse = APIUtil.executeHTTPRequestWithRetries(method, httpClient)) { + responseString = EntityUtils.toString(httpResponse.getEntity(), UTF8); + } catch (APIManagementException e) { + throw new DataLoadingException("Error while retrieving subscriptions", e); } - String responseString = EntityUtils.toString(httpResponse.getEntity(), UTF8); + if (log.isDebugEnabled()) { log.debug("Response : " + responseString); } return responseString; - } private byte[] getServiceCredentials(EventHubConfigurationDto eventHubConfigurationDto) { diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/src/main/java/org/wso2/carbon/apimgt/throttle/policy/deployer/PolicyRetriever.java b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/src/main/java/org/wso2/carbon/apimgt/throttle/policy/deployer/PolicyRetriever.java index 53e6603451ce..2c6204ae951a 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/src/main/java/org/wso2/carbon/apimgt/throttle/policy/deployer/PolicyRetriever.java +++ b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/src/main/java/org/wso2/carbon/apimgt/throttle/policy/deployer/PolicyRetriever.java @@ -237,7 +237,7 @@ private CloseableHttpResponse invokeService(String endpoint, String tenantDomain + new String(credentials, APIConstants.DigestAuthConstants.CHARSET)); HttpClient httpClient = APIUtil.getHttpClient(port, protocol); try { - return APIUtil.executeHTTPRequest(method, httpClient); + return APIUtil.executeHTTPRequestWithRetries(method, httpClient); } catch (APIManagementException e) { throw new ThrottlePolicyDeployerException(e); } From 556ffd702601cc775d2ac5cb873dd712b78a6a58 Mon Sep 17 00:00:00 2001 From: Savindu Dimal Date: Mon, 29 May 2023 22:12:39 +0530 Subject: [PATCH 07/16] Fix unit tests --- .../throttling/util/BlockingConditionRetrieverTest.java | 8 ++++---- .../gateway/throttling/util/KeyTemplateRetrieverTest.java | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/test/java/org/wso2/carbon/apimgt/gateway/throttling/util/BlockingConditionRetrieverTest.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/test/java/org/wso2/carbon/apimgt/gateway/throttling/util/BlockingConditionRetrieverTest.java index 17eff36a8954..d4d48a0cb8ad 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/test/java/org/wso2/carbon/apimgt/gateway/throttling/util/BlockingConditionRetrieverTest.java +++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/test/java/org/wso2/carbon/apimgt/gateway/throttling/util/BlockingConditionRetrieverTest.java @@ -17,10 +17,9 @@ */ package org.wso2.carbon.apimgt.gateway.throttling.util; -import org.apache.http.HttpResponse; -import org.apache.http.ProtocolVersion; import org.apache.http.StatusLine; import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.entity.BasicHttpEntity; import org.junit.Assert; @@ -49,14 +48,15 @@ public void run() throws Exception { ".super\"}],\"user\":[\"admin\"],\"custom\":[]}"; PowerMockito.mockStatic(APIUtil.class); HttpClient httpClient = Mockito.mock(HttpClient.class); - HttpResponse httpResponse = Mockito.mock(HttpResponse.class); + CloseableHttpResponse httpResponse = Mockito.mock(CloseableHttpResponse.class); BasicHttpEntity httpEntity = new BasicHttpEntity(); httpEntity.setContent(new ByteArrayInputStream(content.getBytes())); Mockito.when(httpResponse.getEntity()).thenReturn(httpEntity); StatusLine status = Mockito.mock(StatusLine.class); Mockito.when(status.getStatusCode()).thenReturn(200); Mockito.when(httpResponse.getStatusLine()).thenReturn(status); - Mockito.when(httpClient.execute(Mockito.any(HttpGet.class))).thenReturn(httpResponse); + Mockito.when(APIUtil.executeHTTPRequestWithRetries(Mockito.any(HttpGet.class), Mockito.any(HttpClient.class))) + .thenReturn(httpResponse); BDDMockito.given(APIUtil.getHttpClient(Mockito.anyInt(), Mockito.anyString())).willReturn(httpClient); EventHubConfigurationDto eventHubConfigurationDto = new EventHubConfigurationDto(); eventHubConfigurationDto.setUsername("admin"); diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/test/java/org/wso2/carbon/apimgt/gateway/throttling/util/KeyTemplateRetrieverTest.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/test/java/org/wso2/carbon/apimgt/gateway/throttling/util/KeyTemplateRetrieverTest.java index c9f9b6c5a4b9..8f0f5f693018 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/test/java/org/wso2/carbon/apimgt/gateway/throttling/util/KeyTemplateRetrieverTest.java +++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/test/java/org/wso2/carbon/apimgt/gateway/throttling/util/KeyTemplateRetrieverTest.java @@ -18,9 +18,9 @@ package org.wso2.carbon.apimgt.gateway.throttling.util; -import org.apache.http.HttpResponse; import org.apache.http.StatusLine; import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.entity.BasicHttpEntity; import org.junit.Assert; @@ -33,7 +33,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.wso2.carbon.apimgt.gateway.throttling.ThrottleDataHolder; import org.wso2.carbon.apimgt.impl.dto.EventHubConfigurationDto; -import org.wso2.carbon.apimgt.impl.dto.ThrottleProperties; import org.wso2.carbon.apimgt.impl.utils.APIUtil; import java.io.ByteArrayInputStream; @@ -52,11 +51,13 @@ public void run() throws Exception { String content = "[\"$userId\",\"$apiContext\",\"$apiVersion\"]"; PowerMockito.mockStatic(APIUtil.class); HttpClient httpClient = Mockito.mock(HttpClient.class); - HttpResponse httpResponse = Mockito.mock(HttpResponse.class); + CloseableHttpResponse httpResponse = Mockito.mock(CloseableHttpResponse.class); BasicHttpEntity httpEntity = new BasicHttpEntity(); httpEntity.setContent(new ByteArrayInputStream(content.getBytes())); Mockito.when(httpResponse.getEntity()).thenReturn(httpEntity); Mockito.when(httpClient.execute(Mockito.any(HttpGet.class))).thenReturn(httpResponse); + Mockito.when(APIUtil.executeHTTPRequestWithRetries(Mockito.any(HttpGet.class), Mockito.any(HttpClient.class))) + .thenReturn(httpResponse); StatusLine status = Mockito.mock(StatusLine.class); Mockito.when(status.getStatusCode()).thenReturn(200); Mockito.when(httpResponse.getStatusLine()).thenReturn(status); From 0acb655d3ba36893014175eeb6bff5193332e143 Mon Sep 17 00:00:00 2001 From: Savindu Dimal Date: Fri, 9 Jun 2023 17:36:11 +0530 Subject: [PATCH 08/16] Fix correlation Id for API logs --- .../carbon/apimgt/gateway/handlers/logging/APILogHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/logging/APILogHandler.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/logging/APILogHandler.java index 0ff2a177a089..3e7a1dd7c0e6 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/logging/APILogHandler.java +++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/logging/APILogHandler.java @@ -109,7 +109,7 @@ public static void logAPI(String flow, MessageContext messageContext) { private static void addBasicProperties(JSONObject logMessage, MessageContext messageContext, String flow) { logMessage.put("apiTo", messageContext.getProperty(API_TO)); - logMessage.put("correlationId", messageContext.getProperty(APIConstants.CORRELATION_ID)); + logMessage.put("correlationId", messageContext.getProperty("correlation_id")); logMessage.put("flow", flow); String verb = (String) ((Axis2MessageContext) messageContext).getAxis2MessageContext() .getProperty(APIConstants.DigestAuthConstants.HTTP_METHOD); From f06fdde9becf9d792205c3bb2a60bf28c9a258bf Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 12 Jun 2023 08:52:59 +0000 Subject: [PATCH 09/16] [WSO2 Release] [Jenkins #6664] [Release 9.28.152] prepare release v9.28.152 --- 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 18194ffa01d1..aa79f819f492 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 ab5e3779b77c..fc3e7c2c6ae5 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 df07243a8f40..ea2f5aca9380 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 4.0.0 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 dec9a7a283ff..019779d0c3b8 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 90b70df7d32d..94f714c1ff2b 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 4.0.0 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 0e351975f756..55d5a73910eb 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 4.0.0 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 7777977ba84b..ba3ac5d12d7c 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 4.0.0 diff --git a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml index 7c53c0e5398e..4f37aed6b4c6 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 71e0f5578f35..9310384a9151 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 76bbec3a12a4..276c966931ab 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml index 03b508e16fe7..263f70044015 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml index b5cfe106d545..be5c9e1a8bf0 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml index 9debbb354ae0..caa6dacf52d3 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 76927af5c6e3..d94195e75820 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 050634a927b2..606738d53b97 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 4.0.0 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 ae2f4c865d51..e79786d5d9bb 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml index dc9a6b1887a9..07a6575c12fc 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml index cb0c9bd221d2..e71da397903c 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 org.wso2.carbon.apimgt.notification 4.0.0 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 b9cf4583e513..741ee398e633 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml index ed8878ebbd61..25ed309e21e9 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 4.0.0 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 59b1213cb13e..f608c21883d1 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 f1f588a4bc5f..c9478a50d60f 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 f78ab61b226b..15c1cb4109ed 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 d0da886c24b8..ec0dc29776c4 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 80d57cce01b0..ee1f84d07270 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 39c15edf2f20..bc95b2811088 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 27a445e5e030..3820268e197c 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 2b79483789c8..4d983f4615e0 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 5aa7dff39422..1f8a11687082 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 39014e960535..a7ea6c5f41e1 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml index 0f327a3a7816..c3a70614c857 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 20abff22586e..2e7276ddadb5 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 4.0.0 bundle 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 59b7607b7984..f86ccb11c6d3 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml index 5ab13ab70d89..74b48a5f0dbf 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml index 34c65766e52a..5eef7e74b998 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/components/apimgt/pom.xml b/components/apimgt/pom.xml index 41d839674e0e..d184d37331bb 100644 --- a/components/apimgt/pom.xml +++ b/components/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../../pom.xml 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 f17a94b99a52..cd393ba0d780 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../../pom.xml 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 66d9f750b53d..bfa737f6c3d9 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../../pom.xml 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 dcc668f28fd5..5ef6dc6c8f46 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 193c906240e5..573576e5d120 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 c82130e361bb..14d952212de9 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 847d4376015a..c13feaf0eef3 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml index 4ffb0f679410..32aad314f88e 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 2750e9144628..435153bd9630 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 a47b5f6acef2..c8c6dd472499 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 67d3772c6f27..487844329246 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 24d6b5933517..a8db3b060100 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 d99b9dcdbe85..4f193a57c1ec 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 b38810155516..d3757cdaa46a 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 c39e1b80116e..eb22d1f6cc74 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 1c9926610a53..29737781ab34 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 fafd395772b2..daaf7b370645 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 fba85bc4bbc9..6543fc918d8f 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 02f3d01c21a4..bb57e71218c3 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 3d8882a2e94d..db1ea0c5d77e 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 8dfa32cb0479..c6d5909b3f39 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 654a16069572..deaf3eeeae7c 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 6276ff7fa5a4..4d0fb8448b59 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 5c07a723fde8..2f64f9df31e3 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml 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 cdc19befb96e..7d8ae6513854 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.152-SNAPSHOT + 9.28.152 4.0.0 diff --git a/features/apimgt/pom.xml b/features/apimgt/pom.xml index 1ee78265991c..1e24b9d639c0 100644 --- a/features/apimgt/pom.xml +++ b/features/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../../pom.xml diff --git a/pom.xml b/pom.xml index 497fff98d1ad..7c48f6e00b3b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.apimgt carbon-apimgt pom - 9.28.152-SNAPSHOT + 9.28.152 WSO2 Carbon - API Management Aggregator POM https://wso2.org @@ -21,7 +21,7 @@ https://github.com/wso2/carbon-apimgt.git scm:git:https://github.com/wso2/carbon-apimgt.git scm:git:https://github.com/wso2/carbon-apimgt.git - HEAD + v9.28.152 @@ -1966,7 +1966,7 @@ 1.3 - 9.28.152-SNAPSHOT + 9.28.152 [9.0.0, 10.0.0) 5.3.5 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 e77fe38e8086..d88382a10883 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 @@ org.wso2.carbon.apimgt apimgt-stubs - 9.28.152-SNAPSHOT + 9.28.152 ../pom.xml diff --git a/service-stubs/apimgt/pom.xml b/service-stubs/apimgt/pom.xml index 7761701cb96b..7ef984469705 100644 --- a/service-stubs/apimgt/pom.xml +++ b/service-stubs/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.152-SNAPSHOT + 9.28.152 ../../pom.xml From ac5e3731f18b596cac7129e17bd7dc0e50fac75d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 12 Jun 2023 08:53:04 +0000 Subject: [PATCH 10/16] [WSO2 Release] [Jenkins #6664] [Release 9.28.152] 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 aa79f819f492..466fb8574df0 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 fc3e7c2c6ae5..37522dc07201 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 ea2f5aca9380..a0a4f8e39b04 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT 4.0.0 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 019779d0c3b8..3508988d7ba7 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 94f714c1ff2b..56df9ef50edb 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 4.0.0 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 55d5a73910eb..cfc74c3f5905 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 4.0.0 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 ba3ac5d12d7c..bf52dced21c3 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml index 4f37aed6b4c6..697118e8c6df 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 9310384a9151..32dc3d28be5d 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 276c966931ab..305e1dce8a2b 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml index 263f70044015..7968851088de 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml index be5c9e1a8bf0..9a702c77b120 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml index caa6dacf52d3..cbb97a6025e7 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 d94195e75820..75144b6f1dcb 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 606738d53b97..e7c2f38eddee 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 4.0.0 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 e79786d5d9bb..b72dcd127c58 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml index 07a6575c12fc..f7e7d0977060 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml index e71da397903c..8d7ce3c14c62 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT org.wso2.carbon.apimgt.notification 4.0.0 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 741ee398e633..de3e09342fd8 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml index 25ed309e21e9..42a182995e55 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 4.0.0 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 f608c21883d1..6722a6e4af52 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 c9478a50d60f..f701e8159e92 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 15c1cb4109ed..10a1ea12dd04 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 ec0dc29776c4..84b1706f9eae 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 ee1f84d07270..94db4fa1d9aa 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 bc95b2811088..930d553c0d5b 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 3820268e197c..e97706095057 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 4d983f4615e0..8edeb088820b 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 1f8a11687082..572f264c1db1 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 a7ea6c5f41e1..2026d9b20367 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml index c3a70614c857..d84f36bd3aa8 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 2e7276ddadb5..f16c5294b102 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT 4.0.0 bundle 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 f86ccb11c6d3..1187579f2bee 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml index 74b48a5f0dbf..1f3728bc7fa1 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml index 5eef7e74b998..548c6c0f9f2c 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/components/apimgt/pom.xml b/components/apimgt/pom.xml index d184d37331bb..779adfe170d0 100644 --- a/components/apimgt/pom.xml +++ b/components/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../../pom.xml 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 cd393ba0d780..602e8d811919 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../../pom.xml 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 bfa737f6c3d9..aef833bc016d 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../../pom.xml 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 5ef6dc6c8f46..b4d9fb50e995 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 573576e5d120..1d75ade7a743 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 14d952212de9..c9e0d68669be 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 c13feaf0eef3..995abca8f4f5 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml index 32aad314f88e..1da4b5649f9e 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 435153bd9630..fe1c2fecec1c 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 c8c6dd472499..7d2fd41ae2cc 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 487844329246..948d7d824272 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 a8db3b060100..66584cbdf5d7 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 4f193a57c1ec..a765c22d5a08 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 d3757cdaa46a..fb89e1d43d8d 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 eb22d1f6cc74..b910c12225d2 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 29737781ab34..e2136871b12a 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 daaf7b370645..9f7e0fa86e82 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 6543fc918d8f..1a2894d152e1 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 bb57e71218c3..16b5cbe55e4a 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 db1ea0c5d77e..b8ee088b0c7a 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 c6d5909b3f39..f15c5b18b7b9 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 deaf3eeeae7c..e32482288876 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 4d0fb8448b59..9ece44684fea 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 2f64f9df31e3..1f9848a691f9 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml 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 7d8ae6513854..24bf52eb9cd6 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.152 + 9.28.153-SNAPSHOT 4.0.0 diff --git a/features/apimgt/pom.xml b/features/apimgt/pom.xml index 1e24b9d639c0..c4dda20d0cb7 100644 --- a/features/apimgt/pom.xml +++ b/features/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 7c48f6e00b3b..4098f2955680 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.apimgt carbon-apimgt pom - 9.28.152 + 9.28.153-SNAPSHOT WSO2 Carbon - API Management Aggregator POM https://wso2.org @@ -21,7 +21,7 @@ https://github.com/wso2/carbon-apimgt.git scm:git:https://github.com/wso2/carbon-apimgt.git scm:git:https://github.com/wso2/carbon-apimgt.git - v9.28.152 + HEAD @@ -1966,7 +1966,7 @@ 1.3 - 9.28.152 + 9.28.153-SNAPSHOT [9.0.0, 10.0.0) 5.3.5 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 d88382a10883..c01ace035ecc 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 @@ org.wso2.carbon.apimgt apimgt-stubs - 9.28.152 + 9.28.153-SNAPSHOT ../pom.xml diff --git a/service-stubs/apimgt/pom.xml b/service-stubs/apimgt/pom.xml index 7ef984469705..a1d77118327c 100644 --- a/service-stubs/apimgt/pom.xml +++ b/service-stubs/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.152 + 9.28.153-SNAPSHOT ../../pom.xml From ee573f031c0214158f6bcea60c0b186abf8735ef Mon Sep 17 00:00:00 2001 From: Savindu Dimal Date: Tue, 23 May 2023 19:03:30 +0530 Subject: [PATCH 11/16] Fix websocket host missing from UI --- .../carbon/apimgt/api/ExceptionCodes.java | 2 + .../wso2/carbon/apimgt/api/model/VHost.java | 33 ++++++++++++--- .../publisher/ApisApiServiceImplUtils.java | 21 +++++++++- .../rest/api/publisher/v1/dto/VHostDTO.java | 42 ++++++++++++++++++- .../mappings/EnvironmentMappingUtil.java | 2 + .../src/main/resources/publisher-api.yaml | 6 +++ 6 files changed, 98 insertions(+), 8 deletions(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/ExceptionCodes.java b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/ExceptionCodes.java index e87a0d182d74..375c320dee07 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/ExceptionCodes.java +++ b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/ExceptionCodes.java @@ -163,6 +163,8 @@ public enum ExceptionCodes implements ErrorHandler { 400, "Name of the gateway is read only"), GATEWAY_ENVIRONMENT_VHOST_NOT_PROVIDED(900511, "Gateway Environment virtual hosts name not provided", 400, "Gateway Environment VHOST name not provided"), + INVALID_VHOST(900512, "Invalid virtual host name provided", + 400, "Virtual host with provided vhost name does not exist"), // Workflow related codes WORKFLOW_EXCEPTION(900550, "Workflow error", 500, diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/VHost.java b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/VHost.java index 482cb73dee5e..b5452253cbe0 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/VHost.java +++ b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/VHost.java @@ -27,12 +27,15 @@ * This class represent an Virtual Host */ public class VHost { + // host name from the http endpoint private String host; private String httpContext = ""; private Integer httpPort = -1; private Integer httpsPort = -1; private Integer wsPort = DEFAULT_WS_PORT; + private String wsHost; private Integer wssPort = DEFAULT_WSS_PORT; + private String wssHost; private Integer websubHttpPort = DEFAULT_WEBSUB_HTTP_PORT; private Integer websubHttpsPort = DEFAULT_WEBSUB_HTTPS_PORT; @@ -95,6 +98,14 @@ public void setWsPort(Integer wsPort) { this.wsPort = wsPort; } + public String getWsHost() { + return wsHost; + } + + public void setWsHost(String wsHost) { + this.wsHost = wsHost; + } + public Integer getWssPort() { return wssPort; } @@ -103,6 +114,14 @@ public void setWssPort(Integer wssPort) { this.wssPort = wssPort; } + public String getWssHost() { + return wssHost; + } + + public void setWssHost(String wssHost) { + this.wssHost = wssHost; + } + public Integer getWebsubHttpPort() { return websubHttpPort; } @@ -120,27 +139,27 @@ public void setWebsubHttpsPort(Integer websubHttpsPort) { } public String getHttpUrl() { - return getUrl("http", httpPort == DEFAULT_HTTP_PORT ? "" : ":" + httpPort, httpContext); + return getUrl("http", host, httpPort == DEFAULT_HTTP_PORT ? "" : ":" + httpPort, httpContext); } public String getHttpsUrl() { - return getUrl("https", httpsPort == DEFAULT_HTTPS_PORT ? "" : ":" + httpsPort, httpContext); + return getUrl("https", host, httpsPort == DEFAULT_HTTPS_PORT ? "" : ":" + httpsPort, httpContext); } public String getWsUrl() { - return getUrl("ws", wsPort == DEFAULT_HTTP_PORT ? "" : ":" + wsPort, ""); + return getUrl("ws", wsHost, wsPort == DEFAULT_HTTP_PORT ? "" : ":" + wsPort, ""); } public String getWssUrl() { - return getUrl("wss", wssPort == DEFAULT_HTTPS_PORT ? "" : ":" + wssPort, ""); + return getUrl("wss", wssHost, wssPort == DEFAULT_HTTPS_PORT ? "" : ":" + wssPort, ""); } - private String getUrl(String protocol, String port, String context) { + private String getUrl(String protocol, String hostName, String port, String context) { // {protocol}://{host}{port}{context} if (StringUtils.isNotEmpty(context) && !context.startsWith("/")) { context = "/" + context; } - return String.format("%s://%s%s%s", protocol, host, port, context); + return String.format("%s://%s%s%s", protocol, hostName, port, context); } public static VHost fromEndpointUrls(String[] endpoints) throws APIManagementException { @@ -178,11 +197,13 @@ public static VHost fromEndpointUrls(String[] endpoints) throws APIManagementExc // URL is not parsing for wss protocols, hence change to https url = new URL(HTTPS_PROTOCOL + PROTOCOL_SEPARATOR + elem[1]); vhost.setWssPort(url.getPort() < 0 ? DEFAULT_WSS_PORT : url.getPort()); + vhost.setWssHost(url.getHost()); break; case WS_PROTOCOL: // URL is not parsing for ws protocols, hence change to http url = new URL(HTTP_PROTOCOL + PROTOCOL_SEPARATOR + elem[1]); vhost.setWsPort(url.getPort() < 0 ? DEFAULT_WS_PORT : url.getPort()); + vhost.setWsHost(url.getHost()); break; case WEBSUB_HTTP_PROTOCOL: url = new URL(HTTP_PROTOCOL + PROTOCOL_SEPARATOR + elem[1]); diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/restapi/publisher/ApisApiServiceImplUtils.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/restapi/publisher/ApisApiServiceImplUtils.java index 2dfdd60f7ec1..68ffddf7edc6 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/restapi/publisher/ApisApiServiceImplUtils.java +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/restapi/publisher/ApisApiServiceImplUtils.java @@ -846,14 +846,33 @@ public static APIRevisionDeployment mapAPIRevisionDeploymentWithValidation(Strin final String errorMessage = "Gateway environment not found: " + environment; throw new APIManagementException(errorMessage, ExceptionCodes.from( ExceptionCodes.INVALID_GATEWAY_ENVIRONMENT, String.format("name '%s'", environment))); - } + if (mandatoryVHOST && StringUtils.isEmpty(vhost)) { // vhost is only required when deploying a revision, not required when un-deploying a revision // since the same scheme 'APIRevisionDeployment' is used for deploy and undeploy, handle it here. throw new APIManagementException("Required field 'vhost' not found in deployment", ExceptionCodes.GATEWAY_ENVIRONMENT_VHOST_NOT_PROVIDED); } + + List vhosts = environments.get(environment).getVhosts(); + boolean isVhostValidated = false; + for (VHost vhostItem : vhosts) { + //Checking the vhost is included in the available vhost list + if (vhostItem.getHost().equals(vhost)) { + isVhostValidated = true; + } else if (vhostItem.getWsHost().equals(vhost)) { + // This was added to preserve the functionality in case of Deploying a WebSocket API revision. + // For WebSocket APIs apiRevisionDeploymentDTO.getVhost() returns the wsHost + isVhostValidated = true; + vhost = vhostItem.getHost(); + } + } + + if (mandatoryVHOST && !isVhostValidated) { + throw new APIManagementException("Invalid Vhost: " + vhost, ExceptionCodes.INVALID_VHOST); + } + return mapApiRevisionDeployment(revisionId, vhost, displayOnDevportal, environment); } 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/VHostDTO.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/VHostDTO.java index 0848b55e549d..a4ab1d9d7750 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/VHostDTO.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/VHostDTO.java @@ -25,7 +25,9 @@ public class VHostDTO { private Integer httpPort = null; private Integer httpsPort = null; private Integer wsPort = null; + private String wsHost = null; private Integer wssPort = null; + private String wssHost = null; private Integer websubHttpPort = null; private Integer websubHttpsPort = null; @@ -114,6 +116,23 @@ public void setWsPort(Integer wsPort) { this.wsPort = wsPort; } + /** + **/ + public VHostDTO wsHost(String wsHost) { + this.wsHost = wsHost; + return this; + } + + + @ApiModelProperty(example = "mg.wso2.com", value = "") + @JsonProperty("wsHost") + public String getWsHost() { + return wsHost; + } + public void setWsHost(String wsHost) { + this.wsHost = wsHost; + } + /** **/ public VHostDTO wssPort(Integer wssPort) { @@ -131,6 +150,23 @@ public void setWssPort(Integer wssPort) { this.wssPort = wssPort; } + /** + **/ + public VHostDTO wssHost(String wssHost) { + this.wssHost = wssHost; + return this; + } + + + @ApiModelProperty(example = "mg.wso2.com", value = "") + @JsonProperty("wssHost") + public String getWssHost() { + return wssHost; + } + public void setWssHost(String wssHost) { + this.wssHost = wssHost; + } + /** **/ public VHostDTO websubHttpPort(Integer websubHttpPort) { @@ -180,14 +216,16 @@ public boolean equals(java.lang.Object o) { Objects.equals(httpPort, vhost.httpPort) && Objects.equals(httpsPort, vhost.httpsPort) && Objects.equals(wsPort, vhost.wsPort) && + Objects.equals(wsHost, vhost.wsHost) && Objects.equals(wssPort, vhost.wssPort) && + Objects.equals(wssHost, vhost.wssHost) && Objects.equals(websubHttpPort, vhost.websubHttpPort) && Objects.equals(websubHttpsPort, vhost.websubHttpsPort); } @Override public int hashCode() { - return Objects.hash(host, httpContext, httpPort, httpsPort, wsPort, wssPort, websubHttpPort, websubHttpsPort); + return Objects.hash(host, httpContext, httpPort, httpsPort, wsPort, wsHost, wssPort, wssHost, websubHttpPort, websubHttpsPort); } @Override @@ -200,7 +238,9 @@ public String toString() { sb.append(" httpPort: ").append(toIndentedString(httpPort)).append("\n"); sb.append(" httpsPort: ").append(toIndentedString(httpsPort)).append("\n"); sb.append(" wsPort: ").append(toIndentedString(wsPort)).append("\n"); + sb.append(" wsHost: ").append(toIndentedString(wsHost)).append("\n"); sb.append(" wssPort: ").append(toIndentedString(wssPort)).append("\n"); + sb.append(" wssHost: ").append(toIndentedString(wssHost)).append("\n"); sb.append(" websubHttpPort: ").append(toIndentedString(websubHttpPort)).append("\n"); sb.append(" websubHttpsPort: ").append(toIndentedString(websubHttpsPort)).append("\n"); sb.append("}"); 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/EnvironmentMappingUtil.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/EnvironmentMappingUtil.java index 687e80b3e122..dfad946632e9 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/EnvironmentMappingUtil.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/EnvironmentMappingUtil.java @@ -117,7 +117,9 @@ public static VHostDTO fromVHostToVHostDTO(VHost vHost) { vHostDTO.setHttpPort(vHost.getHttpPort()); vHostDTO.setHttpsPort(vHost.getHttpsPort()); vHostDTO.setWsPort(vHost.getWsPort()); + vHostDTO.setWsHost(vHost.getWsHost()); vHostDTO.setWssPort(vHost.getWssPort()); + vHostDTO.setWssHost(vHost.getWssHost()); vHostDTO.setWebsubHttpPort(vHost.getWebsubHttpPort()); vHostDTO.setWebsubHttpsPort(vHost.getWebsubHttpsPort()); return vHostDTO; 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 63159c6bbf19..f6a1f3775613 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 @@ -10363,9 +10363,15 @@ components: wsPort: type: integer example: 9099 + wsHost: + type: string + example: mg.wso2.com wssPort: type: integer example: 8099 + wssHost: + type: string + example: mg.wso2.com websubHttpPort: type: integer example: 9021 From de9ea6be474f6361d4563ad87f6ef2f84f9d281c Mon Sep 17 00:00:00 2001 From: Savindu Dimal Date: Thu, 25 May 2023 11:58:51 +0530 Subject: [PATCH 12/16] Add host value as default wsHost --- .../wso2/carbon/apimgt/api/model/VHost.java | 8 ++++ .../carbon/apimgt/impl/dao/ApiMgtDAO.java | 3 ++ .../carbon/apimgt/impl/utils/VHostUtils.java | 2 + .../rest/api/admin/v1/dto/VHostDTO.java | 44 ++++++++++++++++++- .../mappings/EnvironmentMappingUtil.java | 10 +++++ .../src/main/resources/admin-api.yaml | 6 +++ 6 files changed, 71 insertions(+), 2 deletions(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/VHost.java b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/VHost.java index b5452253cbe0..a726850d3bbd 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/VHost.java +++ b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/VHost.java @@ -224,6 +224,14 @@ public static VHost fromEndpointUrls(String[] endpoints) throws APIManagementExc throw new APIManagementException("Error while building VHost, missing required HTTP or HTTPS endpoint"); } + // If WebSocket host name of Vhost is empty, use HTTP/HTTPS endpoint hostname + if ((vhost.getWsHost() == null) || (StringUtils.isEmpty(vhost.getWsHost()))) { + vhost.setWsHost(vhost.getHost()); + } + if ((vhost.getWssHost() == null) || (StringUtils.isEmpty(vhost.getWssHost()))) { + vhost.setWssHost(vhost.getHost()); + } + return vhost; } diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java index 11cac8c85c70..94cfa77f0fa2 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/ApiMgtDAO.java @@ -14060,6 +14060,9 @@ private List getVhostGatewayEnvironments(Connection connection, Integer e vhost.setHttpsPort(httpsPort); vhost.setWsPort(wsPort); vhost.setWssPort(wssPort); + // Since DB does not contain columns for wsHost and wssHost, host is used + vhost.setWsHost(host); + vhost.setWssHost(host); vhosts.add(vhost); } } diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/VHostUtils.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/VHostUtils.java index fa9cba2be3fa..50c7610f2172 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/VHostUtils.java +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/VHostUtils.java @@ -41,7 +41,9 @@ public static VHost getVhostFromEnvironment(Environment environment, String host defaultVhost.setHttpsPort(APIConstants.HTTPS_PROTOCOL_PORT); defaultVhost.setHttpPort(APIConstants.HTTP_PROTOCOL_PORT); defaultVhost.setWsPort(APIConstants.WS_PROTOCOL_PORT); + defaultVhost.setWsHost(host); defaultVhost.setWssPort(APIConstants.WSS_PROTOCOL_PORT); + defaultVhost.setWssHost(host); if (host == null && environment.getVhosts().size() > 0) { // VHost is NULL set first Vhost (set in deployment toml) diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/admin/v1/dto/VHostDTO.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/admin/v1/dto/VHostDTO.java index cc50419e5792..92dbe48d892b 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/admin/v1/dto/VHostDTO.java +++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/admin/v1/dto/VHostDTO.java @@ -25,7 +25,9 @@ public class VHostDTO { private Integer httpPort = null; private Integer httpsPort = null; private Integer wsPort = null; + private String wsHost = null; private Integer wssPort = null; + private String wssHost = null; /** **/ @@ -113,6 +115,23 @@ public void setWsPort(Integer wsPort) { this.wsPort = wsPort; } + /** + **/ + public VHostDTO wsHost(String wsHost) { + this.wsHost = wsHost; + return this; + } + + + @ApiModelProperty(example = "mg.wso2.com", value = "") + @JsonProperty("wsHost") + public String getWsHost() { + return wsHost; + } + public void setWsHost(String wsHost) { + this.wsHost = wsHost; + } + /** **/ public VHostDTO wssPort(Integer wssPort) { @@ -130,6 +149,23 @@ public void setWssPort(Integer wssPort) { this.wssPort = wssPort; } + /** + **/ + public VHostDTO wssHost(String wssHost) { + this.wssHost = wssHost; + return this; + } + + + @ApiModelProperty(example = "mg.wso2.com", value = "") + @JsonProperty("wssHost") + public String getWssHost() { + return wssHost; + } + public void setWssHost(String wssHost) { + this.wssHost = wssHost; + } + @Override public boolean equals(java.lang.Object o) { @@ -145,12 +181,14 @@ public boolean equals(java.lang.Object o) { Objects.equals(httpPort, vhost.httpPort) && Objects.equals(httpsPort, vhost.httpsPort) && Objects.equals(wsPort, vhost.wsPort) && - Objects.equals(wssPort, vhost.wssPort); + Objects.equals(wsHost, vhost.wsHost) && + Objects.equals(wssPort, vhost.wssPort) && + Objects.equals(wssHost, vhost.wssHost); } @Override public int hashCode() { - return Objects.hash(host, httpContext, httpPort, httpsPort, wsPort, wssPort); + return Objects.hash(host, httpContext, httpPort, httpsPort, wsPort, wsHost, wssPort, wssHost); } @Override @@ -163,7 +201,9 @@ public String toString() { sb.append(" httpPort: ").append(toIndentedString(httpPort)).append("\n"); sb.append(" httpsPort: ").append(toIndentedString(httpsPort)).append("\n"); sb.append(" wsPort: ").append(toIndentedString(wsPort)).append("\n"); + sb.append(" wsHost: ").append(toIndentedString(wsHost)).append("\n"); sb.append(" wssPort: ").append(toIndentedString(wssPort)).append("\n"); + sb.append(" wssHost: ").append(toIndentedString(wssHost)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/utils/mappings/EnvironmentMappingUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/utils/mappings/EnvironmentMappingUtil.java index ffb200398bf3..abad3585c062 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/utils/mappings/EnvironmentMappingUtil.java +++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/utils/mappings/EnvironmentMappingUtil.java @@ -152,6 +152,16 @@ public static VHost fromVHostDtoToVHost(VHostDTO vhostDTO) { vhost.setHttpsPort(vhostDTO.getHttpsPort()); vhost.setWsPort(vhostDTO.getWsPort()); vhost.setWssPort(vhostDTO.getWssPort()); + if (vhostDTO.getWsHost() == null) { + vhost.setWsHost(vhostDTO.getHost()); + } else { + vhost.setWsHost(vhostDTO.getWsHost()); + } + if (vhostDTO.getWssHost() == null) { + vhost.setWssHost(vhostDTO.getHost()); + } else { + vhost.setWssHost(vhostDTO.getWssHost()); + } return vhost; } diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/resources/admin-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/resources/admin-api.yaml index 0bf90b7383ad..a3cffc42f5c1 100755 --- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/resources/admin-api.yaml +++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/resources/admin-api.yaml @@ -4084,9 +4084,15 @@ components: wsPort: type: integer example: 9099 + wsHost: + type: string + example: mg.wso2.com wssPort: type: integer example: 8099 + wssHost: + type: string + example: mg.wso2.com AdditionalProperty: title: Additional Gateway Properties type: object From 74e81b8494f627b5762da56473b1fa1c8d149e3a Mon Sep 17 00:00:00 2001 From: Dulanjali Dilmi Date: Wed, 14 Jun 2023 11:49:37 +0530 Subject: [PATCH 13/16] Introduce new field 'lastUpdatedTimestamp' for APIs and API Products A new field named lastUpdatedTimestamp is introduced and UI will read this value to show Last Updated Time in APIs and API Products pages Fix wso2/api-manager#1860 --- .../rest/api/publisher/v1/dto/APIDTO.java | 22 ++++++++++++++++++- .../api/publisher/v1/dto/APIProductDTO.java | 22 ++++++++++++++++++- .../v1/common/mappings/APIMappingUtil.java | 2 ++ .../src/main/resources/publisher-api.yaml | 4 ++++ 4 files changed, 48 insertions(+), 2 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 ab0878f64db6..84a599426891 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 @@ -268,6 +268,7 @@ public static AccessControlEnum fromValue(String v) { private WebsubSubscriptionConfigurationDTO websubSubscriptionConfiguration = null; private String workflowStatus = null; private String createdTime = null; + private String lastUpdatedTimestamp = null; @Scope(name = "apim:api_publish", description="", value ="") @Scope(name = "apim:api_manage", description="", value ="") private String lastUpdatedTime = null; @@ -1075,6 +1076,23 @@ public void setCreatedTime(String createdTime) { this.createdTime = createdTime; } + /** + **/ + public APIDTO lastUpdatedTimestamp(String lastUpdatedTimestamp) { + this.lastUpdatedTimestamp = lastUpdatedTimestamp; + return this; + } + + + @ApiModelProperty(value = "") + @JsonProperty("lastUpdatedTimestamp") + public String getLastUpdatedTimestamp() { + return lastUpdatedTimestamp; + } + public void setLastUpdatedTimestamp(String lastUpdatedTimestamp) { + this.lastUpdatedTimestamp = lastUpdatedTimestamp; + } + /** **/ public APIDTO lastUpdatedTime(String lastUpdatedTime) { @@ -1361,6 +1379,7 @@ public boolean equals(java.lang.Object o) { Objects.equals(websubSubscriptionConfiguration, API.websubSubscriptionConfiguration) && Objects.equals(workflowStatus, API.workflowStatus) && Objects.equals(createdTime, API.createdTime) && + Objects.equals(lastUpdatedTimestamp, API.lastUpdatedTimestamp) && Objects.equals(lastUpdatedTime, API.lastUpdatedTime) && Objects.equals(endpointConfig, API.endpointConfig) && Objects.equals(endpointImplementationType, API.endpointImplementationType) && @@ -1378,7 +1397,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, subscriptionAvailability, subscriptionAvailableTenants, additionalProperties, additionalPropertiesMap, monetization, accessControl, accessControlRoles, businessInformation, corsConfiguration, websubSubscriptionConfiguration, workflowStatus, createdTime, 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, securityScheme, maxTps, visibility, visibleRoles, visibleTenants, mediationPolicies, 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 @@ -1429,6 +1448,7 @@ public String toString() { sb.append(" websubSubscriptionConfiguration: ").append(toIndentedString(websubSubscriptionConfiguration)).append("\n"); sb.append(" workflowStatus: ").append(toIndentedString(workflowStatus)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" lastUpdatedTimestamp: ").append(toIndentedString(lastUpdatedTimestamp)).append("\n"); sb.append(" lastUpdatedTime: ").append(toIndentedString(lastUpdatedTime)).append("\n"); sb.append(" endpointConfig: ").append(toIndentedString(endpointConfig)).append("\n"); sb.append(" endpointImplementationType: ").append(toIndentedString(endpointImplementationType)).append("\n"); 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 7aa29096df7b..ed184c00bd84 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 @@ -193,6 +193,7 @@ public static SubscriptionAvailabilityEnum fromValue(String v) { private APICorsConfigurationDTO corsConfiguration = null; private String createdTime = null; private String lastUpdatedTime = null; + private String lastUpdatedTimestamp = null; private String gatewayVendor = null; private List apis = new ArrayList(); private List scopes = new ArrayList(); @@ -800,6 +801,23 @@ public void setLastUpdatedTime(String lastUpdatedTime) { this.lastUpdatedTime = lastUpdatedTime; } + /** + **/ + public APIProductDTO lastUpdatedTimestamp(String lastUpdatedTimestamp) { + this.lastUpdatedTimestamp = lastUpdatedTimestamp; + return this; + } + + + @ApiModelProperty(value = "") + @JsonProperty("lastUpdatedTimestamp") + public String getLastUpdatedTimestamp() { + return lastUpdatedTimestamp; + } + public void setLastUpdatedTimestamp(String lastUpdatedTimestamp) { + this.lastUpdatedTimestamp = lastUpdatedTimestamp; + } + /** **/ public APIProductDTO gatewayVendor(String gatewayVendor) { @@ -933,6 +951,7 @@ public boolean equals(java.lang.Object o) { Objects.equals(corsConfiguration, apIProduct.corsConfiguration) && Objects.equals(createdTime, apIProduct.createdTime) && Objects.equals(lastUpdatedTime, apIProduct.lastUpdatedTime) && + Objects.equals(lastUpdatedTimestamp, apIProduct.lastUpdatedTimestamp) && Objects.equals(gatewayVendor, apIProduct.gatewayVendor) && Objects.equals(apis, apIProduct.apis) && Objects.equals(scopes, apIProduct.scopes) && @@ -942,7 +961,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, 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, securityScheme, subscriptionAvailability, subscriptionAvailableTenants, additionalProperties, additionalPropertiesMap, monetization, businessInformation, corsConfiguration, createdTime, lastUpdatedTime, lastUpdatedTimestamp, gatewayVendor, apis, scopes, categories, workflowStatus); } @Override @@ -984,6 +1003,7 @@ public String toString() { sb.append(" corsConfiguration: ").append(toIndentedString(corsConfiguration)).append("\n"); sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); sb.append(" lastUpdatedTime: ").append(toIndentedString(lastUpdatedTime)).append("\n"); + sb.append(" lastUpdatedTimestamp: ").append(toIndentedString(lastUpdatedTimestamp)).append("\n"); sb.append(" gatewayVendor: ").append(toIndentedString(gatewayVendor)).append("\n"); sb.append(" apis: ").append(toIndentedString(apis)).append("\n"); sb.append(" scopes: ").append(toIndentedString(scopes)).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 b5bf72cefb18..4272e0896e1d 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 @@ -1339,6 +1339,7 @@ public static APIDTO fromAPItoDTO(API model, boolean preserveCredentials, Date lastUpdateDate = model.getLastUpdated(); Timestamp timeStamp = new Timestamp(lastUpdateDate.getTime()); dto.setLastUpdatedTime(String.valueOf(timeStamp)); + dto.setLastUpdatedTimestamp(String.valueOf(timeStamp.getTime())); } if (null != model.getCreatedTime()) { Date created = new Date(Long.parseLong(model.getCreatedTime())); @@ -2453,6 +2454,7 @@ public static APIProductDTO fromAPIProducttoDTO(APIProduct product) throws APIMa Date lastUpdateDate = product.getLastUpdated(); Timestamp timeStamp = new Timestamp(lastUpdateDate.getTime()); productDto.setLastUpdatedTime(String.valueOf(timeStamp)); + productDto.setLastUpdatedTimestamp(String.valueOf(timeStamp.getTime())); } if (null != product.getCreatedTime()) { Date createdTime = product.getCreatedTime(); 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 63159c6bbf19..a9ed88ad1ae2 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 @@ -8837,6 +8837,8 @@ components: example: APPROVED createdTime: type: string + lastUpdatedTimestamp: + type: string lastUpdatedTime: type: string x-otherScopes: @@ -9435,6 +9437,8 @@ components: type: string lastUpdatedTime: type: string + lastUpdatedTimestamp: + type: string gatewayVendor: title: field to identify gateway vendor type: string From 93da7821c3ab10fa536444d395aa2b701f2d4606 Mon Sep 17 00:00:00 2001 From: Isuru Wijesiri Date: Wed, 14 Jun 2023 13:06:53 +0530 Subject: [PATCH 14/16] Bump json-smart and json-path versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4098f2955680..a7afc0830bf0 100644 --- a/pom.xml +++ b/pom.xml @@ -2092,7 +2092,7 @@ 4.5.10 1.14 7.9.0.wso2v1 - 2.3 + 2.4.11 2.3 1.7.0 1.7.29 @@ -2188,7 +2188,7 @@ 3.0.0.wso2v1 1.9.4 1.1.3 - 2.6.0.wso2v1 + 2.6.0.wso2v2 1.6.wso2v1 2.6.0.wso2v1 1.2.4 From 64f9bf3482076dd84f4d960e41d8a41c0310f595 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 15 Jun 2023 02:27:51 +0000 Subject: [PATCH 15/16] [WSO2 Release] [Jenkins #6669] [Release 9.28.153] prepare release v9.28.153 --- 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 466fb8574df0..66b8b24c76b9 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 37522dc07201..52a3e05d1b27 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 a0a4f8e39b04..59bc9e8c5928 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 4.0.0 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 3508988d7ba7..e657466736ac 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 56df9ef50edb..dbaa495ca754 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 4.0.0 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 cfc74c3f5905..7a0da518737a 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 4.0.0 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 bf52dced21c3..c9bd8438dfa3 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 4.0.0 diff --git a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml index 697118e8c6df..17dd40c43cf8 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 32dc3d28be5d..1a9f4d3576d4 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 305e1dce8a2b..2061e0f09305 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml index 7968851088de..e11ec9b60e9d 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml index 9a702c77b120..8ed72111ca95 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml index cbb97a6025e7..05357dbf6e77 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 75144b6f1dcb..ccc246b6b491 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 e7c2f38eddee..06d0da450ba7 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 4.0.0 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 b72dcd127c58..d8263e89e689 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml index f7e7d0977060..6efb2ea61773 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml index 8d7ce3c14c62..fe1609365171 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 org.wso2.carbon.apimgt.notification 4.0.0 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 de3e09342fd8..b691f71d8c44 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml index 42a182995e55..e8ea63e537da 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 4.0.0 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 6722a6e4af52..a3941ebeaf79 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 f701e8159e92..02e758a27d10 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 10a1ea12dd04..67db7e2e04be 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 84b1706f9eae..867b27ac3a96 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 94db4fa1d9aa..eb3f8dea3b20 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 930d553c0d5b..3a0ae622495f 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 e97706095057..2c4eadc7fbc2 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 8edeb088820b..2c5321ad8b46 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 572f264c1db1..b6daeb494144 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 2026d9b20367..a5dc95b7b9c1 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml index d84f36bd3aa8..e96400f467c1 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 f16c5294b102..d036acb79952 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 4.0.0 bundle 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 1187579f2bee..95c699450041 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml index 1f3728bc7fa1..c7aa8eacca49 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml index 548c6c0f9f2c..98730a047222 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/components/apimgt/pom.xml b/components/apimgt/pom.xml index 779adfe170d0..ea182abda52c 100644 --- a/components/apimgt/pom.xml +++ b/components/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../../pom.xml 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 602e8d811919..a0e081b16c60 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../../pom.xml 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 aef833bc016d..e4f253008c4b 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../../pom.xml 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 b4d9fb50e995..caaf2f05535a 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 1d75ade7a743..86a7cd17f4b1 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 c9e0d68669be..f4007284698b 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 995abca8f4f5..e7349079c8fe 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml index 1da4b5649f9e..c20dd60bc12a 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 fe1c2fecec1c..5e4593b2ce73 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 7d2fd41ae2cc..1bdcfe197c40 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 948d7d824272..50c4aa2147cf 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 66584cbdf5d7..5f48e2fcea86 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 a765c22d5a08..21a75b468e31 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 fb89e1d43d8d..de294ae11401 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 b910c12225d2..8c7cd6e349a4 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 e2136871b12a..1d0ab72c8cdf 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 9f7e0fa86e82..ff68911e7655 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 1a2894d152e1..2d71ba6a7e70 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 16b5cbe55e4a..4d42f2fbb113 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 b8ee088b0c7a..0f96ff9e7d36 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 f15c5b18b7b9..ed5a96d11678 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 e32482288876..b88343633b04 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 9ece44684fea..5b7376676a1c 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 1f9848a691f9..191d86db89c7 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml 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 24bf52eb9cd6..e87fc72f412f 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.153-SNAPSHOT + 9.28.153 4.0.0 diff --git a/features/apimgt/pom.xml b/features/apimgt/pom.xml index c4dda20d0cb7..525d148f514b 100644 --- a/features/apimgt/pom.xml +++ b/features/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../../pom.xml diff --git a/pom.xml b/pom.xml index 4098f2955680..569e3c665880 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.apimgt carbon-apimgt pom - 9.28.153-SNAPSHOT + 9.28.153 WSO2 Carbon - API Management Aggregator POM https://wso2.org @@ -21,7 +21,7 @@ https://github.com/wso2/carbon-apimgt.git scm:git:https://github.com/wso2/carbon-apimgt.git scm:git:https://github.com/wso2/carbon-apimgt.git - HEAD + v9.28.153 @@ -1966,7 +1966,7 @@ 1.3 - 9.28.153-SNAPSHOT + 9.28.153 [9.0.0, 10.0.0) 5.3.5 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 c01ace035ecc..9e5681ab968a 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 @@ org.wso2.carbon.apimgt apimgt-stubs - 9.28.153-SNAPSHOT + 9.28.153 ../pom.xml diff --git a/service-stubs/apimgt/pom.xml b/service-stubs/apimgt/pom.xml index a1d77118327c..f6279f6e8a80 100644 --- a/service-stubs/apimgt/pom.xml +++ b/service-stubs/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.153-SNAPSHOT + 9.28.153 ../../pom.xml From 7c5eed9034f6998a47a016dadad9c3ec2658be02 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 15 Jun 2023 02:27:55 +0000 Subject: [PATCH 16/16] [WSO2 Release] [Jenkins #6669] [Release 9.28.153] 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 66b8b24c76b9..81f7996557e0 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 52a3e05d1b27..da0962c2eed5 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 59bc9e8c5928..958afea8c5a7 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT 4.0.0 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 e657466736ac..f1c7e0ccbba1 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 dbaa495ca754..1ee5147d2387 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 4.0.0 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 7a0da518737a..74d11cf905b3 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 4.0.0 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 c9bd8438dfa3..e1094b940933 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml index 17dd40c43cf8..7e326d7e7230 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 1a9f4d3576d4..4cf37eb17c2c 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 2061e0f09305..eea8d9639cc9 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml index e11ec9b60e9d..54a861dfbf60 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml index 8ed72111ca95..328e082749db 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml index 05357dbf6e77..6954c5e36835 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 ccc246b6b491..08cda276d53e 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 06d0da450ba7..275efaf47a8c 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 4.0.0 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 d8263e89e689..a16ecc51fbf7 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml index 6efb2ea61773..9ec295aae857 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml index fe1609365171..1f292a060c88 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT org.wso2.carbon.apimgt.notification 4.0.0 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 b691f71d8c44..274267790456 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml index e8ea63e537da..448ff0332ff2 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 4.0.0 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 a3941ebeaf79..189c8424f648 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 02e758a27d10..cb26c326016d 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 67db7e2e04be..4c61e874964c 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 867b27ac3a96..2c05175b7188 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 eb3f8dea3b20..30a16d3dcb6b 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 3a0ae622495f..15c735861ac6 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 2c4eadc7fbc2..35e4c9704f46 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 2c5321ad8b46..3352046dffdc 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 b6daeb494144..f77e674abf39 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 a5dc95b7b9c1..82524ea60a60 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml index e96400f467c1..2116b5eebcf8 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 d036acb79952..f64ef5bdcd5f 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT 4.0.0 bundle 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 95c699450041..2b12d3a07eed 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml index c7aa8eacca49..aaf14773073c 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml index 98730a047222..7c3c12b1cb5c 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 @@ org.wso2.carbon.apimgt apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/components/apimgt/pom.xml b/components/apimgt/pom.xml index ea182abda52c..1bbba3130bd8 100644 --- a/components/apimgt/pom.xml +++ b/components/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../../pom.xml 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 a0e081b16c60..b5d9400e5720 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../../pom.xml 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 e4f253008c4b..92ba9f346f20 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 @@ apimgt org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../../pom.xml 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 caaf2f05535a..c3d0d3bf7aa4 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 86a7cd17f4b1..4e6f884f5091 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 f4007284698b..5cbdcd0cbd42 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 e7349079c8fe..8e6c9676cfe1 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml index c20dd60bc12a..e6f28cad0ab0 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 5e4593b2ce73..0d6b7ddb9fb0 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 1bdcfe197c40..30058b8b9f5a 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 50c4aa2147cf..330695d71c87 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 5f48e2fcea86..c93f0e34c624 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 21a75b468e31..434494280a3f 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 de294ae11401..6aa3262b5dd4 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 8c7cd6e349a4..62bd7e59de4d 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 1d0ab72c8cdf..93b3d76565a6 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 ff68911e7655..ed65266489a4 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 2d71ba6a7e70..028e475ef549 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 4d42f2fbb113..9be9df8222e2 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 0f96ff9e7d36..0ed8ec1f23e6 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 ed5a96d11678..6d8443c114f2 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 b88343633b04..7f2c4cecd4e3 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 5b7376676a1c..51da913db4d4 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 191d86db89c7..eb23fbb16da7 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 @@ org.wso2.carbon.apimgt apimgt-feature - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml 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 e87fc72f412f..de7b420672df 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 @@ apimgt-feature org.wso2.carbon.apimgt - 9.28.153 + 9.28.154-SNAPSHOT 4.0.0 diff --git a/features/apimgt/pom.xml b/features/apimgt/pom.xml index 525d148f514b..33dd7da60415 100644 --- a/features/apimgt/pom.xml +++ b/features/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 569e3c665880..0d98d814c763 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.apimgt carbon-apimgt pom - 9.28.153 + 9.28.154-SNAPSHOT WSO2 Carbon - API Management Aggregator POM https://wso2.org @@ -21,7 +21,7 @@ https://github.com/wso2/carbon-apimgt.git scm:git:https://github.com/wso2/carbon-apimgt.git scm:git:https://github.com/wso2/carbon-apimgt.git - v9.28.153 + HEAD @@ -1966,7 +1966,7 @@ 1.3 - 9.28.153 + 9.28.154-SNAPSHOT [9.0.0, 10.0.0) 5.3.5 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 9e5681ab968a..f6a724d94863 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 @@ org.wso2.carbon.apimgt apimgt-stubs - 9.28.153 + 9.28.154-SNAPSHOT ../pom.xml diff --git a/service-stubs/apimgt/pom.xml b/service-stubs/apimgt/pom.xml index f6279f6e8a80..475ca1190efd 100644 --- a/service-stubs/apimgt/pom.xml +++ b/service-stubs/apimgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.apimgt carbon-apimgt - 9.28.153 + 9.28.154-SNAPSHOT ../../pom.xml