Merge remote-tracking branch 'upstream/master' into java17-compatibility

wso2 · Sep 28, 2022 · 99fe15d · 99fe15d
2 parents 7787d53 + 5845a58
commit 99fe15d
Show file tree

Hide file tree

Showing 38 changed files with 40 additions and 40 deletions.
diff --git a/...dentity.api.user.application/org.wso2.carbon.identity.api.user.application.common/pom.xml b/...dentity.api.user.application/org.wso2.carbon.identity.api.user.application.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.user.application</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...entity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/pom.xml b/...entity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.user.application</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.wso2.carbon.identity.rest.api.user.application.v1</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>WSO2 Identity Server - User Application Management Rest API</name>
     <description>WSO2 Identity Server - User Application Management Rest API</description>

diff --git a/components/org.wso2.carbon.identity.api.user.application/pom.xml b/components/org.wso2.carbon.identity.api.user.application/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...rbon.identity.api.user.approval/org.wso2.carbon.identity.api.user.approval.common/pom.xml b/...rbon.identity.api.user.approval/org.wso2.carbon.identity.api.user.approval.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.user.approval</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...bon.identity.api.user.approval/org.wso2.carbon.identity.rest.api.user.approval.v1/pom.xml b/...bon.identity.api.user.approval/org.wso2.carbon.identity.rest.api.user.approval.v1/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.user.approval</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.api.user.approval/pom.xml b/components/org.wso2.carbon.identity.api.user.approval/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...on.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/pom.xml b/...on.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/pom.xml
@@ -6,7 +6,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.association</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.user.association.v1</artifactId>

diff --git a/components/org.wso2.carbon.identity.api.user.association/pom.xml b/components/org.wso2.carbon.identity.api.user.association/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...pi.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/pom.xml b/...pi.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.authorized.apps</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...pi.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/pom.xml b/...pi.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.user.authorized.apps</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/pom.xml b/components/org.wso2.carbon.identity.api.user.authorized.apps/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/....identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.common/pom.xml b/....identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.backupcode</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...rbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/pom.xml b/...rbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.backupcode</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.user.backupcode.v1</artifactId>

diff --git a/components/org.wso2.carbon.identity.api.user.backupcode/pom.xml b/components/org.wso2.carbon.identity.api.user.backupcode/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...on.identity.api.user.challenge/org.wso2.carbon.identity.api.user.challenge.common/pom.xml b/...on.identity.api.user.challenge/org.wso2.carbon.identity.api.user.challenge.common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.challenge</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...n.identity.api.user.challenge/org.wso2.carbon.identity.rest.api.user.challenge.v1/pom.xml b/...n.identity.api.user.challenge/org.wso2.carbon.identity.rest.api.user.challenge.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.challenge</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.user.challenge.v1</artifactId>

diff --git a/components/org.wso2.carbon.identity.api.user.challenge/pom.xml b/components/org.wso2.carbon.identity.api.user.challenge/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.api.user.common/pom.xml b/components/org.wso2.carbon.identity.api.user.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...so2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.common/pom.xml b/...so2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.common/pom.xml
@@ -4,7 +4,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.fido2</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...rg.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/pom.xml b/...rg.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.fido2</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.user.fido2.v1</artifactId>

diff --git a/components/org.wso2.carbon.identity.api.user.fido2/pom.xml b/components/org.wso2.carbon.identity.api.user.fido2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...ity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/pom.xml b/...ity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.user.functionality</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...ty.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/pom.xml b/...ty.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.user.functionality</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.user.functionality.v1</artifactId>

diff --git a/components/org.wso2.carbon.identity.api.user.functionality/pom.xml b/components/org.wso2.carbon.identity.api.user.functionality/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...rg.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.common/pom.xml b/...rg.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.mfa</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...r.mfa.common/src/main/java/org/wso2/carbon/identity/api/user/mfa/common/MFAConstants.java b/...r.mfa.common/src/main/java/org/wso2/carbon/identity/api/user/mfa/common/MFAConstants.java
@@ -26,8 +26,8 @@ public class MFAConstants {
 
     public static final String AUTHENTICATED_WITH_BASIC_AUTH = "AuthenticatedWithBasicAuth";
 
-    public static final String BACKUP_CODE_AUTHENTICATOR = "Backup Code Authenticator";
-    public static final String TOTP_AUTHENTICATOR = "TOTP";
+    public static final String BACKUP_CODE_AUTHENTICATOR = "backup-code-authenticator";
+    public static final String TOTP_AUTHENTICATOR = "totp";
 
     /**
      * Enum for MFA related errors in the format of

diff --git a/...ts/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/pom.xml b/...ts/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.mfa</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.user.mfa.v1</artifactId>

diff --git a/components/org.wso2.carbon.identity.api.user.mfa/pom.xml b/components/org.wso2.carbon.identity.api.user.mfa/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...bon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/pom.xml b/...bon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.user.recovery</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...bon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/pom.xml b/...bon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.user.recovery</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.api.user.recovery/pom.xml b/components/org.wso2.carbon.identity.api.user.recovery/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/pom.xml b/...carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.session</artifactId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...so2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/pom.xml b/...so2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.session</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.user.session.v1</artifactId>

diff --git a/components/org.wso2.carbon.identity.api.user.session/pom.xml b/components/org.wso2.carbon.identity.api.user.session/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/....wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.common/pom.xml b/....wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.totp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.user.totp.common</artifactId>

diff --git a/.../org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/pom.xml b/.../org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.user.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.user.totp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.user.totp.v1</artifactId>

diff --git a/components/org.wso2.carbon.identity.api.user.totp/pom.xml b/components/org.wso2.carbon.identity.api.user.totp/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-user</artifactId>
         <groupId>org.wso2.carbon.identity.user.api</groupId>
-        <version>1.3.2-SNAPSHOT</version>
+        <version>1.3.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-user</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
     <name>WSO2 Identity Server - User API Module</name>
     <description>