Merge pull request #625 from dhaura/DP-complete-app-branding-resolver

Update Application Branding Resolver Calling Method
wso2 · Jul 15, 2024 · 56e96aa · 56e96aa
2 parents e6c87bf + d9fe4fc
commit 56e96aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...pi/server/branding/preference/management/v1/core/BrandingPreferenceManagementService.java b/...pi/server/branding/preference/management/v1/core/BrandingPreferenceManagementService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -202,7 +202,7 @@ So always locale as default locale(en-US).
             if (APPLICATION_TYPE.equals(type)) {
                 // Get application specific branding preference.
                 responseDTO = BrandingPreferenceServiceHolder.getBrandingPreferenceManager().
-                        resolveApplicationBrandingPreference(name, DEFAULT_LOCALE);
+                        resolveBrandingPreference(APPLICATION_TYPE, name, DEFAULT_LOCALE);
             } else {
                 // Get default branding preference.
                 responseDTO = BrandingPreferenceServiceHolder.getBrandingPreferenceManager().

diff --git a/pom.xml b/pom.xml
@@ -818,7 +818,7 @@
         <org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>2.4.21</org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>
         <org.wso2.carbon.logging.service.version>4.10.7</org.wso2.carbon.logging.service.version>
         <org.wso2.carbon.event.publisher.version>5.2.15</org.wso2.carbon.event.publisher.version>
-        <identity.branding.preference.management.version>1.1.1</identity.branding.preference.management.version>
+        <identity.branding.preference.management.version>1.1.13</identity.branding.preference.management.version>
         <apache.felix.scr.ds.annotations.version>1.2.4</apache.felix.scr.ds.annotations.version>
 
         <!--<maven.checkstyleplugin.excludes>**/gen/**/*</maven.checkstyleplugin.excludes>-->
@@ -833,7 +833,7 @@
         </org.wso2.carbon.identity.organization.management.core.version.range>
 
         <!-- Organization management service Version -->
-        <org.wso2.carbon.identity.organization.management.version>1.4.10
+        <org.wso2.carbon.identity.organization.management.version>1.4.42
         </org.wso2.carbon.identity.organization.management.version>
 
         <!-- Unit test versions -->