Merge pull request #12248 from Lakith-Rambukkanage/vMaster-REST-minor

Bump REST API minor version for 4.3.0
wso2 · Feb 9, 2024 · 7d1221e · 7d1221e
2 parents 8dd4b61 + 2751441
commit 7d1221e
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 17 deletions.
diff --git a/components/apimgt/org.wso2.carbon.apimgt.internal.service/swagger.json b/components/apimgt/org.wso2.carbon.apimgt.internal.service/swagger.json
@@ -1296,8 +1296,8 @@
           "type" : "string",
           "example" : "EXCHANGED",
           "description" : "The type of the tokens to be used (exchanged or without exchanged). Accepted values are EXCHANGED, DIRECT or BOTH.",
-          "enum" : [ "EXCHANGED", "DIRECT", "BOTH" ],
-          "default" : "DIRECT"
+          "default" : "DIRECT",
+          "enum" : [ "EXCHANGED", "DIRECT", "BOTH" ]
         }
       }
     },

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
@@ -5457,4 +5457,4 @@ components:
             apim:role_manage: Manage system roles
             apim:admin_application_view: View Applications
             apim:keymanagers_manage: Manage Key Managers
-            apim:api_provider_change: Retrieve and manage applications
+            apim:api_provider_change: Retrieve and manage applications
diff --git a/....apimgt.rest.api.admin.v1/src/main/resources/docs/examples/applications/applications.yaml b/....apimgt.rest.api.admin.v1/src/main/resources/docs/examples/applications/applications.yaml
@@ -2,7 +2,7 @@ delete:
   - id: deleteApplication
   - request:
       method: DELETE
-      url: https://localhost:9443/api/am/admin/v1/applications/367a2361-8db5-4140-8133-c6c8dc7fa0c4
+      url: https://localhost:9443/api/am/admin/v4/applications/367a2361-8db5-4140-8133-c6c8dc7fa0c4
       headers: |
         Authorization: Bearer ae4eae22-3f65-387b-a171-d37eaa366fa8
     response:

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/webapp/WEB-INF/beans.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/webapp/WEB-INF/beans.xml
@@ -67,7 +67,7 @@
 
     <bean id="URLValidationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor">
         <property name="majorVersion" value="v4" />
-        <property name="latestVersion" value="v4.0" />
+        <property name="latestVersion" value="v4.1" />
     </bean>
     <bean id="PreAuthenticationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.PreAuthenticationInterceptor" />
     <bean id="TokenMergeInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.TokenMergeInterceptor" />

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
@@ -157,6 +157,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
+                            <overwrite>true</overwrite>
                             <outputDirectory>src/main/resources/</outputDirectory>
                             <resources>
                                 <resource>
@@ -177,6 +178,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
+                            <overwrite>true</overwrite>
                             <outputDirectory>src/main/resources/</outputDirectory>
                             <resources>
                                 <resource>
@@ -197,6 +199,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
+                            <overwrite>true</overwrite>
                             <outputDirectory>src/main/resources/</outputDirectory>
                             <resources>
                                 <resource>
@@ -217,6 +220,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
+                            <overwrite>true</overwrite>
                             <outputDirectory>src/main/resources/</outputDirectory>
                             <resources>
                                 <resource>

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/admin-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/admin-api.yaml
@@ -5299,4 +5299,4 @@ components:
             apim:scope_manage: Manage system scopes
             apim:role_manage: Manage system roles
             apim:admin_application_view: View Applications
-            apim:keymanagers_manage: Manage Key Managers
+            apim:keymanagers_manage: Manage Key Managers
diff --git a/...nents/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/devportal-api.yaml b/...nents/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/devportal-api.yaml
@@ -6102,4 +6102,4 @@ components:
             apim:store_settings: Retrieve Developer Portal settings
             apim:sub_alert_manage: Retrieve, subscribe and configure Developer Portal alert types
             apim:app_import_export: Import and export applications related operations
-            apim:admin: Manage all admin operations
+            apim:admin: Manage all admin operations
diff --git a/...apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/service-catalog-api.yaml b/...apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/service-catalog-api.yaml
@@ -90,7 +90,7 @@ info:
     Navigate through the API descriptions to find the required API, obtain an access token as described above and invoke the API with the authentication header.
     If you use a different authentication mechanism, this process may change.
 
-  version: '1.1'
+  version: '1.2'
 servers:
   - url: 'https://apis.wso2.com/api/service-catalog/v1'
   - url: 'http://apis.wso2.com/api/service-catalog/v1'

diff --git a/...onents/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/src/main/resources/gateway-api.yaml b/...onents/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/src/main/resources/gateway-api.yaml
@@ -3,7 +3,7 @@ swagger: '2.0'
 # Prolog
 ######################################################
 info:
-  version: "v2.2"
+  version: "v2.3"
   title: "WSO2 API Manager - Gateway"
   description: |
     This document specifies a **RESTful API** for WSO2 **API Manager** - Gateway.

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/src/main/webapp/WEB-INF/beans.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/src/main/webapp/WEB-INF/beans.xml
@@ -37,7 +37,7 @@
 
     <bean id="URLValidationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor">
         <property name="majorVersion" value="v2" />
-        <property name="latestVersion" value="v2.2" />
+        <property name="latestVersion" value="v2.3" />
     </bean>
     <bean id="PreAuthenticationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.PreAuthenticationInterceptor" />
     <bean id="TokenMergeInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.TokenMergeInterceptor" />

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/swagger.json b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/swagger.json
@@ -2,7 +2,7 @@
   "swagger" : "2.0",
   "info" : {
     "description" : "This document specifies a **RESTful API** for WSO2 **API Manager** - Gateway.\nPlease see [full swagger definition](https://raw.githubusercontent.com/wso2/carbon-apimgt/master/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/src/main/resources/gateway-api.yaml) of the API which is written using [swagger 2.0](http://swagger.io/) specification.\n",
-    "version" : "v2.2",
+    "version" : "v2.3",
     "title" : "WSO2 API Manager - Gateway",
     "contact" : {
       "name" : "WSO2",

diff --git a/...nts/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/webapp/WEB-INF/beans.xml b/...nts/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/webapp/WEB-INF/beans.xml
@@ -53,7 +53,7 @@
 
     <bean id="URLValidationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor">
         <property name="majorVersion" value="v4" />
-        <property name="latestVersion" value="v4.0" />
+        <property name="latestVersion" value="v4.1" />
     </bean>
     <bean id="PreAuthenticationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.PreAuthenticationInterceptor" />
     <bean id="TokenMergeInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.TokenMergeInterceptor" />

diff --git a/...g.wso2.carbon.apimgt.rest.api.service.catalog/src/main/resources/service-catalog-api.yaml b/...g.wso2.carbon.apimgt.rest.api.service.catalog/src/main/resources/service-catalog-api.yaml
@@ -90,7 +90,7 @@ info:
     Navigate through the API descriptions to find the required API, obtain an access token as described above and invoke the API with the authentication header.
     If you use a different authentication mechanism, this process may change.
 
-  version: '1.1'
+  version: '1.2'
 servers:
   - url: 'https://apis.wso2.com/api/service-catalog/v1'
   - url: 'http://apis.wso2.com/api/service-catalog/v1'

diff --git a/.../apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/src/main/webapp/WEB-INF/beans.xml b/.../apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/src/main/webapp/WEB-INF/beans.xml
@@ -36,7 +36,7 @@
 
   <bean id="URLValidationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor">
     <property name="majorVersion" value="v1" />
-    <property name="latestVersion" value="v1.1" />
+    <property name="latestVersion" value="v1.2" />
   </bean>
   <bean id="PreAuthenticationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.PreAuthenticationInterceptor" />
   <bean id="TokenMergeInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.TokenMergeInterceptor" />

diff --git a/...nts/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml b/...nts/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml
@@ -6102,4 +6102,4 @@ components:
             apim:store_settings: Retrieve Developer Portal settings
             apim:sub_alert_manage: Retrieve, subscribe and configure Developer Portal alert types
             apim:app_import_export: Import and export applications related operations
-            apim:admin: Manage all admin operations
+            apim:admin: Manage all admin operations
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/webapp/WEB-INF/beans.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/webapp/WEB-INF/beans.xml
@@ -47,7 +47,7 @@
 
     <bean id="URLValidationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.URLValidationInterceptor">
         <property name="majorVersion" value="v3" />
-        <property name="latestVersion" value="v3.0" />
+        <property name="latestVersion" value="v3.1" />
     </bean>
     <bean id="PreAuthenticationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.PreAuthenticationInterceptor" />
     <bean id="AuthenticationInterceptor" class="org.wso2.carbon.apimgt.rest.api.util.interceptors.auth.OAuthAuthenticationInterceptor" />

diff --git a/...ures/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/config/api-manager.xml b/...ures/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/config/api-manager.xml
@@ -681,7 +681,7 @@
     	<ServerUrl>https://localhost:9445/bpmn</ServerUrl>
     	<ServerUser>${admin.username}</ServerUser>
     	<ServerPassword>${admin.password}</ServerPassword>
-    	<WorkflowCallbackAPI>https://localhost:${mgt.transport.https.port}/api/am/admin/v2/workflows/update-workflow-status</WorkflowCallbackAPI>
+    	<WorkflowCallbackAPI>https://localhost:${mgt.transport.https.port}/api/am/admin/v4/workflows/update-workflow-status</WorkflowCallbackAPI>
         <TokenEndPoint>https://localhost:${https.nio.port}/token</TokenEndPoint>
         <DCREndPoint>https://localhost:${mgt.transport.https.port}/client-registration/v0.17/register</DCREndPoint>
         <DCREndPointUser>${admin.username}</DCREndPointUser>