Merge branch '4.3.0-kernel-upgrade' of github.com:wso2/carbon-apimgt into 4.3.0-token-persistence

Author: dushaniw

components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml

@@ -137,7 +137,7 @@
         </dependency>
         <dependency>
             <groupId>org.wso2.orbit.com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <artifactId>h2-engine</artifactId>
         </dependency>
         <dependency>
             <groupId>com.ibm.icu</groupId>

components/apimgt/org.wso2.carbon.apimgt.impl/src/test/resources/definitions/oas3/oas3_app_security_key.json

@@ -418,6 +418,8 @@
       }
     }
   },
+  "x-wso2-cors" : null,
+  "x-wso2-basePath" : null,
   "x-wso2-application-security" : {
     "security-types" : [ "oauth2", "api_key" ],
     "optional" : false

components/apimgt/org.wso2.carbon.apimgt.impl/src/test/resources/definitions/oas3/publisher/oas3_mig_with_sec_extensions_response.json

@@ -102,6 +102,8 @@
       } ]
     }
   },
+  "x-wso2-cors" : null,
+  "x-wso2-basePath" : null,
   "x-wso2-application-security" : {
     "security-types" : [ "oauth2" ],
     "optional" : false

components/apimgt/org.wso2.carbon.apimgt.impl/src/test/resources/definitions/oas3/publisher/oas3_mig_without_sec_extensions_response.json

@@ -85,6 +85,8 @@
       }
     }
   },
+  "x-wso2-cors" : null,
+  "x-wso2-basePath" : null,
   "x-wso2-application-security" : {
     "security-types" : [ "oauth2" ],
     "optional" : false

components/apimgt/org.wso2.carbon.apimgt.impl/src/test/resources/definitions/oas3/publisher/oas3_with_default_oauth_response.json

@@ -78,6 +78,8 @@
       }
     }
   },
+  "x-wso2-cors" : null,
+  "x-wso2-basePath" : null,
   "x-wso2-application-security" : {
     "security-types" : [ "api_key", "basic_auth", "oauth2" ],
     "optional" : false

features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml

@@ -36,7 +36,7 @@
     <dependencies>
         <dependency>
             <groupId>org.wso2.orbit.com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <artifactId>h2-engine</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>

pom.xml

@@ -946,7 +946,7 @@
 
             <dependency>
                 <groupId>org.wso2.orbit.com.h2database</groupId>
-                <artifactId>h2</artifactId>
+                <artifactId>h2-engine</artifactId>
                 <version>${h2.orbit.version}</version>
             </dependency>
 
@@ -2162,7 +2162,7 @@
         <event.processor.core.version>2.3.8</event.processor.core.version>
         <swagger.inflector.version>1.0.16.wso2v1</swagger.inflector.version>
         <swagger.inflector.oas3.version>2.0.5.wso2v2</swagger.inflector.oas3.version>
-        <swagger.parser.v3.version>2.1.18.wso2v1</swagger.parser.v3.version>
+        <swagger.parser.v3.version>2.1.20.wso2v1</swagger.parser.v3.version>
         <swagger.core.version>1.6.11.wso2v1</swagger.core.version>
         <swagger.models.version>1.6.11</swagger.models.version>
         <swagger.annotations.version>1.6.11</swagger.annotations.version>
@@ -2257,7 +2257,7 @@
         <javax.annotation.verion>1.3.2</javax.annotation.verion>
         <log4j2.version>2.17.1</log4j2.version>
         <jinjava.version>2.5.6</jinjava.version>
-        <h2.orbit.version>2.1.210.wso2v1</h2.orbit.version>
+        <h2.orbit.version>2.2.220.wso2v1</h2.orbit.version>
         <tomcat.version>9.0.53</tomcat.version>
         <tika.version>2.7.0</tika.version>
         <batik.version>1.16</batik.version>