Merge pull request #12552 from RakhithaRR/ctl-version-bump

Bump APIM version to fix CTL test failures
wso2 · Sep 10, 2024 · 8652b74 · 8652b74
2 parents d5b28eb + 1a0638f
commit 8652b74
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -118,7 +118,7 @@ jobs:
  run: mv product-apim/modules/integration/tests-integration/tests-backend/target/surefire-reports/TEST-TestSuite.xml TEST-TestSuite_${{ matrix.id }}.xml
  - name: Archive testng report
  if: always()
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
  with:
  name: TEST-TestSuite_${{ matrix.id }}
  path: |

diff --git a/...gt.impl/src/main/java/org/wso2/carbon/apimgt/impl/importexport/ImportExportConstants.java b/...gt.impl/src/main/java/org/wso2/carbon/apimgt/impl/importexport/ImportExportConstants.java
@@ -203,7 +203,7 @@ public final class ImportExportConstants {
 
  public static final String TYPE_POLICY_SPECIFICATION = "operation_policy_specification";
 
- public static final String APIM_VERSION = "v4.3.0";
+ public static final String APIM_VERSION = "v4.4.0";
 
  public static final String ENDPOINT_CONFIG = "endpointConfig";
 

diff --git a/...src/main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/impl/ThrottlingApiServiceImpl.java b/...src/main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/impl/ThrottlingApiServiceImpl.java
@@ -1102,7 +1102,7 @@ public Response exportThrottlingPolicy(String policyId, String policyName, Strin
  String userName = RestApiCommonUtil.getLoggedInUsername();
  ExportThrottlePolicyDTO exportPolicy = new ExportThrottlePolicyDTO();
  exportPolicy.type(RestApiConstants.RESOURCE_THROTTLING_POLICY);
- exportPolicy.version("v4.3.0");
+ exportPolicy.version(ImportExportConstants.APIM_VERSION);
  type = (type == null) ? StringUtils.EMPTY : type;
  if (StringUtils.EMPTY.equals(type) || PolicyConstants.POLICY_LEVEL_APP.equals(type)) {
  try {

diff --git a/...c/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/utils/RestApiPublisherUtils.java b/...c/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/utils/RestApiPublisherUtils.java
@@ -293,11 +293,11 @@ public static File exportOperationPolicyData(OperationPolicyData policyData, Str
  if (format.equalsIgnoreCase(ExportFormat.YAML.name())) {
  CommonUtil.writeDtoToFile(policyName, ExportFormat.YAML,
  ImportExportConstants.TYPE_POLICY_SPECIFICATION,
- policyData.getSpecification(), "v4.3.0");
+ policyData.getSpecification(), ImportExportConstants.APIM_VERSION);
  } else if (format.equalsIgnoreCase(ExportFormat.JSON.name())) {
  CommonUtil.writeDtoToFile(policyName, ExportFormat.JSON,
  ImportExportConstants.TYPE_POLICY_SPECIFICATION,
- policyData.getSpecification(), "v4.3.0");
+ policyData.getSpecification(), ImportExportConstants.APIM_VERSION);
  }
  }
  if (policyData.getSynapsePolicyDefinition() != null) {