Changes of Kernel Bump in API-M 4.3.0

HiranyaKavishani · Jan 15, 2024 · 5ae9b71 · 5ae9b71
1 parent ef63e73
commit 5ae9b71
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 28 deletions.
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
@@ -137,7 +137,17 @@
         </dependency>
         <dependency>
             <groupId>org.wso2.orbit.com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <artifactId>h2-engine</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.wso2.eclipse.osgi</groupId>
+                    <artifactId>org.eclipse.osgi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.ibm.icu</groupId>

diff --git a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
@@ -102,11 +102,6 @@
             <artifactId>reflections</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.apimgt</groupId>
-            <artifactId>org.wso2.carbon.apimgt.rest.api.util</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.apimgt</groupId>
             <artifactId>org.wso2.carbon.apimgt.impl</artifactId>

diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
@@ -147,12 +147,12 @@
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-    <dependency>
-      <groupId>org.jacoco</groupId>
-      <artifactId>org.jacoco.agent</artifactId>
-      <classifier>runtime</classifier>
-      <scope>test</scope>
-    </dependency>
+        <dependency>
+          <groupId>org.jacoco</groupId>
+          <artifactId>org.jacoco.agent</artifactId>
+          <classifier>runtime</classifier>
+          <scope>test</scope>
+        </dependency>
 
 	</dependencies>
 </project>
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
@@ -36,7 +36,17 @@
     <dependencies>
         <dependency>
             <groupId>org.wso2.orbit.com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <artifactId>h2-engine</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.wso2.eclipse.osgi</groupId>
+                    <artifactId>org.eclipse.osgi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>

diff --git a/pom.xml b/pom.xml
@@ -911,8 +911,11 @@
                 <artifactId>org.wso2.carbon.registry.core</artifactId>
                 <version>${carbon.kernel.version}</version>
             </dependency>
-
-
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.logging.correlation</artifactId>
+                <version>${carbon.kernel.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jaggeryjs</groupId>
                 <artifactId>org.jaggeryjs.scriptengine</artifactId>
@@ -946,7 +949,7 @@
 
             <dependency>
                 <groupId>org.wso2.orbit.com.h2database</groupId>
-                <artifactId>h2</artifactId>
+                <artifactId>h2-engine</artifactId>
                 <version>${h2.orbit.version}</version>
             </dependency>
 
@@ -1935,11 +1938,6 @@
                 <version>${mockserver.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.logging.correlation</artifactId>
-                <version>${carbon.kernel.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.tika</groupId>
                 <artifactId>tika-core</artifactId>
@@ -1981,21 +1979,21 @@
 
         <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
         <!-- Carbon kernel version -->
-        <carbon.kernel.version>4.8.1</carbon.kernel.version>
+        <carbon.kernel.version>4.9.21-SNAPSHOT</carbon.kernel.version>
         <carbon.kernel.feature.version>${carbon.kernel.version}</carbon.kernel.feature.version>
         <carbon.kernel.package.import.version.range>[4.5.0, 5.0.0)</carbon.kernel.package.import.version.range>
 
         <carbon.commons.version>4.10.7</carbon.commons.version>
 
         <carbon.registry.version>4.8.15</carbon.registry.version>
-        <carbon.mediation.version>4.7.186-SNAPSHOT</carbon.mediation.version>
+        <carbon.mediation.version>4.7.186</carbon.mediation.version>
 
         <mongodb.driver.version>4.1.0</mongodb.driver.version>
 
         <!-- Carbon Identity versions -->
-        <carbon.identity.version>5.25.542</carbon.identity.version>
-        <carbon.identity.governance.version>1.8.90</carbon.identity.governance.version>
-        <carbon.identity-inbound-auth-oauth.version>6.11.219</carbon.identity-inbound-auth-oauth.version>
+        <carbon.identity.version>5.25.565</carbon.identity.version>
+        <carbon.identity.governance.version>1.8.103</carbon.identity.governance.version>
+        <carbon.identity-inbound-auth-oauth.version>6.11.236</carbon.identity-inbound-auth-oauth.version>
         <carbon.identity-oauth2-grant-jwt.version>2.2.2</carbon.identity-oauth2-grant-jwt.version>
         <carbon.identity-user-ws.version>5.7.4</carbon.identity-user-ws.version>
         <carbon.identity-data-publisher-application-authentication.version>5.6.6</carbon.identity-data-publisher-application-authentication.version>
@@ -2158,7 +2156,7 @@
         <fasterxml.jackson.databind.version>2.15.2</fasterxml.jackson.databind.version>
         <fasterxml.jackson.core.version>2.15.2</fasterxml.jackson.core.version>
         <javax.validation-api>2.0.1.Final</javax.validation-api>
-        <carbon.broker.version>3.3.27</carbon.broker.version>
+        <carbon.broker.version>3.3.30-SNAPSHOT</carbon.broker.version>
         <andes.version>3.3.25</andes.version>
         <waffle-jna.version>1.6.wso2v7</waffle-jna.version>
         <version.snake.yaml>1.33</version.snake.yaml>
@@ -2241,9 +2239,11 @@
         <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>
     </properties>
 </project>
+
+