Merge branch 'master' into ashanthamara-patch-2

wso2 · Dec 2, 2023 · 50f6edb · 50f6edb
2 parents bd584b7 + 7649f5e
commit 50f6edb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/...o2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json b/...o2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json
@@ -102,8 +102,8 @@
   "tokenEndpointAuthMethod": {
     "options": [
       {
-        "name":"None",
-        "displayName":"None"
+        "name":"",
+        "displayName":"Select Option"
       },
       {
         "name": "client_secret_post",
@@ -132,30 +132,30 @@
   },
   "idTokenSignatureAlgorithm": {
     "options": [
-      "None",
+      "Select Option",
       "PS256",
       "ES256",
       "SHA256withRSA"
     ]
   },
   "requestObjectSignatureAlgorithm": {
     "options": [
-      "None",
+      "Select Option",
       "PS256",
       "ES256",
       "SHA256withRSA"
     ]
   },
   "requestObjectEncryptionAlgorithm": {
     "options": [
-      "None",
+      "Select Option",
       "RSA-OAEP",
       "RSA1_5"
     ]
   },
   "requestObjectEncryptionMethod": {
     "options": [
-      "None",
+      "Select Option",
       "A128GCM",
       "A192GCM",
       "A256GCM",
@@ -179,7 +179,7 @@
       },
       "allowedEncryptionAlgorithms": {
         "options": [
-          "None",
+          "Select Option",
           "RSA-OAEP"
         ]
       },

diff --git a/pom.xml b/pom.xml
@@ -2283,7 +2283,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.25.570</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.580</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 6.0.0]</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->
@@ -2342,15 +2342,15 @@
         <callhome.version>4.5.x_1.0.14</callhome.version>
 
         <!-- Authenticator Versions -->
-        <identity.outbound.auth.oidc.version>5.11.28</identity.outbound.auth.oidc.version>
+        <identity.outbound.auth.oidc.version>5.11.29</identity.outbound.auth.oidc.version>
         <identity.outbound.auth.oauth2.version>1.0.11</identity.outbound.auth.oauth2.version>
         <identity.outbound.auth.passive.sts.version>5.5.0</identity.outbound.auth.passive.sts.version>
         <identity.outbound.auth.samlsso.version>5.8.7</identity.outbound.auth.samlsso.version>
         <identity.outbound.auth.requestpath.basicauth.version>5.5.4</identity.outbound.auth.requestpath.basicauth.version>
         <identity.outbound.auth.requestpath.oauth.version>5.5.4</identity.outbound.auth.requestpath.oauth.version>
 
         <!-- Social Authenticator Versions -->
-        <social.authenticator.facebook.version>5.2.10</social.authenticator.facebook.version>
+        <social.authenticator.facebook.version>5.2.11</social.authenticator.facebook.version>
         <social.authenticator.google.version>5.2.14</social.authenticator.google.version>
         <social.authenticator.windowslive.version>5.2.2</social.authenticator.windowslive.version>
         <social.authenticator.apple.version>1.0.4</social.authenticator.apple.version>
@@ -2382,7 +2382,7 @@
         <authenticator.backupcode.version>0.0.16</authenticator.backupcode.version>
         <authenticator.office365.version>2.1.2</authenticator.office365.version>
         <authenticator.smsotp.version>3.3.16</authenticator.smsotp.version>
-        <authenticator.magiclink.version>1.1.17</authenticator.magiclink.version>
+        <authenticator.magiclink.version>1.1.18</authenticator.magiclink.version>
         <authenticator.emailotp.version>4.1.21</authenticator.emailotp.version>
         <authenticator.local.auth.emailotp.version>1.0.12</authenticator.local.auth.emailotp.version>
         <authenticator.local.auth.smsotp.version>1.0.3</authenticator.local.auth.smsotp.version>
@@ -2405,7 +2405,7 @@
         <!-- Identity REST API feature -->
         <identity.api.dispatcher.version>2.0.13</identity.api.dispatcher.version>
         <identity.user.api.version>1.3.28</identity.user.api.version>
-        <identity.server.api.version>1.2.132</identity.server.api.version>
+        <identity.server.api.version>1.2.134</identity.server.api.version>
 
         <identity.agent.sso.version>5.5.9</identity.agent.sso.version>
         <identity.tool.samlsso.validator.version>5.5.7</identity.tool.samlsso.validator.version>