Update kernel version

wso2-extensions · Jan 20, 2024 · 247f91e · 247f91e
1 parent b25ded6
commit 247f91e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/...entity.sso.saml/src/test/java/org/wso2/carbon/identity/sso/saml/util/SAMLSSOUtilTest.java b/...entity.sso.saml/src/test/java/org/wso2/carbon/identity/sso/saml/util/SAMLSSOUtilTest.java
@@ -62,6 +62,7 @@
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.user.core.tenant.TenantManager;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+import org.wso2.carbon.utils.security.KeystoreUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -418,6 +419,8 @@ public void testGetX509CredentialImplForTenant() throws Exception {
         when(tenantManager.getTenantId(anyString())).thenReturn(1);
         mockStatic(KeyStoreManager.class);
         when(KeyStoreManager.getInstance(eq(1))).thenReturn(keyStoreManager);
+        when(KeystoreUtils.getKeyStoreFileLocation(TestConstants.WSO2_TENANT_DOMAIN)).thenReturn(TestConstants
+                .WSO2_TENANT_DOMAIN.replace(".", "-") + TestUtils.getFilePath(TestConstants.KEY_STORE_NAME));
         when(keyStoreManager.getKeyStore(eq(SAMLSSOUtil.generateKSNameFromDomainName(TestConstants.WSO2_TENANT_DOMAIN)))).thenReturn
                 (TestUtils.loadKeyStoreFromFileSystem(TestUtils
                         .getFilePath(TestConstants.KEY_STORE_NAME), TestConstants.WSO2_CARBON, "PKCS12"));
@@ -433,6 +436,8 @@ public void testGetX509CredentialImplException() throws Exception {
         when(tenantManager.getTenantId(anyString())).thenReturn(1);
         mockStatic(KeyStoreManager.class);
         when(KeyStoreManager.getInstance(eq(1))).thenReturn(keyStoreManager);
+        when(KeystoreUtils.getKeyStoreFileLocation(TestConstants.WSO2_TENANT_DOMAIN)).thenReturn(TestConstants
+                .WSO2_TENANT_DOMAIN.replace(".", "-") + TestUtils.getFilePath(TestConstants.KEY_STORE_NAME));
         when(keyStoreManager.getKeyStore(eq(SAMLSSOUtil.generateKSNameFromDomainName(TestConstants.WSO2_TENANT_DOMAIN)))).thenReturn
                 (null);
         X509CredentialImpl x509Credential = SAMLSSOUtil.getX509CredentialImplForTenant(TestConstants

diff --git a/components/org.wso2.carbon.identity.sso.saml/src/test/resources/conf/wso2carbon.jks b/components/org.wso2.carbon.identity.sso.saml/src/test/resources/conf/wso2carbon.jks
diff --git a/components/org.wso2.carbon.identity.sso.saml/src/test/resources/conf/wso2carbon.p12 b/components/org.wso2.carbon.identity.sso.saml/src/test/resources/conf/wso2carbon.p12
diff --git a/pom.xml b/pom.xml
@@ -455,7 +455,7 @@
     </modules>
 
     <properties>
-        <carbon.kernel.version>4.9.22-SNAPSHOT</carbon.kernel.version>
+        <carbon.kernel.version>4.9.23</carbon.kernel.version>
         <carbon.kernel.feature.version>4.9.0</carbon.kernel.feature.version>
         <carbon.identity.framework.version>5.25.507</carbon.identity.framework.version>
         <carbon.identity.framework.imp.pkg.version.range>[5.25.260, 7.0.0)