Merge pull request #13318 from npamudika/master

Add changes for APIM 4.3.0 Release
wso2 · Jan 16, 2024 · 27c1a81 · 27c1a81
2 parents 4c75cfe + 39177c3
commit 27c1a81
Show file tree

Hide file tree

Showing 56 changed files with 71 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -204,7 +204,7 @@ System Requirements
 Installation & Running
 ==================================
 
-1. Extract the wso2am-4.2.0.zip and go to the 'bin' directory
+1. Extract the wso2am-4.3.0.zip and go to the 'bin' directory
 2. Run the api-manager.sh or api-manager.bat script based on you operating system.
 3. Access the respective WSO2 API-M interfaces
     * API Publisher web application is running at - https://localhost:9443/publisher \

diff --git a/README.txt b/README.txt
@@ -168,7 +168,7 @@ is recommended.
 Installation & Running
 ==================================
 
-1. Extract the wso2am-4.2.0.zip and go to the 'bin' directory
+1. Extract the wso2am-4.3.0.zip and go to the 'bin' directory
 2. Run the api-manager.sh or api-manager.bat script based on you operating system.
 3. Access the respective WSO2 API-M interfaces
     * API Publisher web application is running at - https://localhost:9443/publisher
@@ -182,7 +182,7 @@ Documentation
 ==============
 
 Online product documentation is available at:
-        https://apim.docs.wso2.com/en/4.2.0/
+        https://apim.docs.wso2.com/en/4.3.0/
 
 Support
 ==================================

diff --git a/docs/xdoc/release-notes.xml b/docs/xdoc/release-notes.xml
@@ -23,14 +23,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <meta content="text/html; charset=iso-8859-1" http-equiv="content-type"/>
-    <title>WSO2 API Manager v4.2.0 - 11th March 2023</title>
+    <title>WSO2 API Manager v4.3.0 - 1st April 2024</title>
 </head>
 <body>
 <div id="main-content">
-<h1>WSO2 API Manager 4.2.0 Released!</h1>
+<h1>WSO2 API Manager 4.3.0 Released!</h1>
 
 <p>
-    The WSO2 API Manager team is pleased to announce the release of version 4.2.0 of
+    The WSO2 API Manager team is pleased to announce the release of version 4.3.0 of
     the Open Source API Manager.
 </p>
 
@@ -77,7 +77,7 @@
     <li>Use "admin", "admin" as the username and password to login as an admin</li>
 </ol>
 
-    <h2>Bug Fixes And Improvements in 4.2.0</h2>
+    <h2>Bug Fixes And Improvements in 4.3.0</h2>
     <ul>
         <li>GitHub (<a href="https://github.com/wso2/api-manager/issues?q=is%3Aissue+is%3Aclosed+label%3AComponent%2FAPIM+closed%3A2022-04-05..2023-03-11">api-manager</a>)
         </li>

diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/callhome/pom.xml b/modules/callhome/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/distribution/apim-is-plugin/README.md b/modules/distribution/apim-is-plugin/README.md
@@ -1,4 +1,4 @@
-# WSO2 APIM IS Plugin - 4.2.0
+# WSO2 APIM IS Plugin - 4.3.0
 
 ## Prerequisites:
 1. Download WSO2 IS product

diff --git a/modules/distribution/apim-is-plugin/pom.xml b/modules/distribution/apim-is-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/distribution/product/pom.xml b/modules/distribution/product/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-distribution-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/distribution/product/src/main/assembly/filter.properties b/modules/distribution/product/src/main/assembly/filter.properties
@@ -1,9 +1,9 @@
 product.name=WSO2 API Manager
 product.key=AM
-product.version=4.2.0
+product.version=4.3.0
 product.wum.name=wso2am
 
 carbon.version=4.8.1
-am.version=4.2.0
+am.version=4.3.0
 default.server.role=APIManager
 bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
diff --git a/modules/distribution/product/src/main/resources/conf/default.json b/modules/distribution/product/src/main/resources/conf/default.json
@@ -45,8 +45,8 @@
   "oauth.grant_type.uma_ticket.grant_handler": "org.wso2.carbon.identity.oauth.uma.grant.UMA2GrantHandler",
   "oauth.grant_type.uma_ticket.grant_validator": "org.wso2.carbon.identity.oauth.uma.grant.GrantValidator",
   "system.parameter.'org.wso2.CipherTransformation'": "RSA/ECB/OAEPwithSHA1andMGF1Padding",
-  "server.userAgent": "WSO2 AM 4.2.0",
-  "server.serverDetails": "WSO2 AM 4.2.0",
+  "server.userAgent": "WSO2 AM 4.3.0",
+  "server.serverDetails": "WSO2 AM 4.3.0",
   "message_formatter.form_urlencoded": "org.apache.axis2.transport.http.XFormURLEncodedFormatter",
   "message_formatter.multipart_form_data": "org.apache.axis2.transport.http.MultipartFormDataFormatter",
   "message_formatter.application_xml": "org.apache.axis2.transport.http.ApplicationXMLFormatter",

diff --git a/modules/features/pom.xml b/modules/features/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml b/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>am-features</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/features/product/org.wso2.am.security.feature/pom.xml b/modules/features/product/org.wso2.am.security.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>am-features</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/features/product/org.wso2.am.styles.feature/pom.xml b/modules/features/product/org.wso2.am.styles.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-features</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/features/product/pom.xml b/modules/features/product/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
     	<artifactId>am-features-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
@@ -21,7 +21,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml b/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>test-artifacts</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/backend-service/monitor-app/pom.xml b/modules/integration/tests-common/backend-service/monitor-app/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>test-artifacts</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/backend-service/pom.xml b/modules/integration/tests-common/backend-service/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/clients/admin/pom.xml b/modules/integration/tests-common/clients/admin/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>org.wso2.am.integration.clients</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/modules/integration/tests-common/clients/gateway/pom.xml b/modules/integration/tests-common/clients/gateway/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>org.wso2.am.integration.clients</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/modules/integration/tests-common/clients/internal-api/pom.xml b/modules/integration/tests-common/clients/internal-api/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>org.wso2.am.integration.clients</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/modules/integration/tests-common/clients/pom.xml b/modules/integration/tests-common/clients/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/clients/publisher/pom.xml b/modules/integration/tests-common/clients/publisher/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>org.wso2.am.integration.clients</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/modules/integration/tests-common/clients/service-catalog/pom.xml b/modules/integration/tests-common/clients/service-catalog/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>org.wso2.am.integration.clients</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/modules/integration/tests-common/clients/store/pom.xml b/modules/integration/tests-common/clients/store/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>org.wso2.am.integration.clients</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/modules/integration/tests-common/extenstions/org.wso2.am.thirdparty.km/pom.xml b/modules/integration/tests-common/extenstions/org.wso2.am.thirdparty.km/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>extenstions</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/integration/tests-common/extenstions/pom.xml b/modules/integration/tests-common/extenstions/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/integration/tests-common/framework-extensions/pom.xml b/modules/integration/tests-common/framework-extensions/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/integration-test-extensions/pom.xml b/modules/integration/tests-common/integration-test-extensions/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@ under the License.
         <dependency>
             <groupId>org.wso2.am</groupId>
             <artifactId>org.wso2.am.framework.extensions</artifactId>
-            <version>4.2.0-SNAPSHOT</version>
+            <version>4.3.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.am</groupId>

diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -20,7 +20,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
@@ -20,7 +20,7 @@ under the License.
     <parent>
         <artifactId>integration</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
@@ -20,7 +20,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
@@ -21,7 +21,7 @@ under the License.
     <parent>
         <artifactId>integration</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml
@@ -20,7 +20,7 @@ under the License.
     <parent>
         <artifactId>org.wso2.carbon.am.integration.test</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/.../integration/tests/restapi/admin/throttlingpolicy/ThrottlePolicyExportImportTestCase.java b/.../integration/tests/restapi/admin/throttlingpolicy/ThrottlePolicyExportImportTestCase.java
@@ -58,7 +58,7 @@ public class ThrottlePolicyExportImportTestCase extends APIMIntegrationBaseTest
     private final String DISPLAY_NAME = "Test Policy";
     private final String TIME_UNIT = "min";
     private final Integer UNIT_TIME = 1;
-    private final String APIM_VERSION = "v4.2.0";
+    private final String APIM_VERSION = "v4.3.0";
     private final String DESCRIPTION = "This is a test throttle policy";
     private final String ADVANCED_POLICY_NAME = "TestPolicyAdvanced";
     private final String APPLICATION_POLICY_NAME = "TestPolicyApplication";

diff --git a/...ts-backend/src/test/resources/artifacts/AM/operationPolicy/customCommonLogJSONPolicy.json b/...ts-backend/src/test/resources/artifacts/AM/operationPolicy/customCommonLogJSONPolicy.json
@@ -1,6 +1,6 @@
 {
   "type": "operation_policy_specification",
-  "version": "v4.2.0",
+  "version": "v4.3.0",
   "data": {
     "category": "Mediation",
     "name": "customCommonLogPolicy",

diff --git a/.../tests-backend/src/test/resources/artifacts/AM/operationPolicy/customCommonLogPolicy.yaml b/.../tests-backend/src/test/resources/artifacts/AM/operationPolicy/customCommonLogPolicy.yaml
@@ -1,5 +1,5 @@
 type: operation_policy_specification
-version: v4.2.0
+version: v4.3.0
 data:
   category: Mediation
   name: customCommonLogPolicy