diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml index 4b274403394..6c2e51222a5 100644 --- a/modules/api-resources/api-resources-full/pom.xml +++ b/modules/api-resources/api-resources-full/pom.xml @@ -23,12 +23,12 @@ org.wso2.is api-resources - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../pom.xml api-resources-full - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT war WSO2 Identity Server - All Rest API diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml index 6a2fac4e2e9..e5eaa1832ef 100644 --- a/modules/api-resources/pom.xml +++ b/modules/api-resources/pom.xml @@ -23,12 +23,12 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml api-resources - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT pom WSO2 Identity Server - Rest API diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml index 1c65ce9c06f..f29a9c56b6c 100644 --- a/modules/authenticators/pom.xml +++ b/modules/authenticators/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml index 8b5a2404b43..a9727e58f81 100644 --- a/modules/connectors/pom.xml +++ b/modules/connectors/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index aa8a32075f3..a3e97f63860 100755 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/src/repository/resources/conf/deployment.toml b/modules/distribution/src/repository/resources/conf/deployment.toml index c63761c7286..918af13fd60 100644 --- a/modules/distribution/src/repository/resources/conf/deployment.toml +++ b/modules/distribution/src/repository/resources/conf/deployment.toml @@ -39,9 +39,6 @@ hash= "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262" [identity.auth_framework.endpoint] app_password= "dashboard" -[notification_templates] -enable_unicode_support = true - # The KeyStore which is used for encrypting/decrypting internal data. By default the primary keystore is used as the internal keystore. #[keystore.internal] diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml index 68e82256b80..a0753e4c2d8 100644 --- a/modules/features/org.wso2.identity.styles.feature/pom.xml +++ b/modules/features/org.wso2.identity.styles.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-features - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../pom.xml diff --git a/modules/features/org.wso2.identity.ui.feature/pom.xml b/modules/features/org.wso2.identity.ui.feature/pom.xml index 8909cd30f0a..474b68b1076 100644 --- a/modules/features/org.wso2.identity.ui.feature/pom.xml +++ b/modules/features/org.wso2.identity.ui.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-features - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../pom.xml diff --git a/modules/features/org.wso2.identity.utils.feature/pom.xml b/modules/features/org.wso2.identity.utils.feature/pom.xml index da2e48977f1..dcea635a1ee 100644 --- a/modules/features/org.wso2.identity.utils.feature/pom.xml +++ b/modules/features/org.wso2.identity.utils.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-features - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index c027be0cdb5..806d2d56a8b 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -17,7 +17,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/integration-ui-templates/pom.xml b/modules/integration-ui-templates/pom.xml index 02f9affd269..90e84af9b92 100644 --- a/modules/integration-ui-templates/pom.xml +++ b/modules/integration-ui-templates/pom.xml @@ -22,7 +22,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 1fd4f003557..86955dadcf1 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml index 0b1bfc0d3cf..5af0e3d5626 100644 --- a/modules/integration/tests-common/admin-clients/pom.xml +++ b/modules/integration/tests-common/admin-clients/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml index 68e72fd171c..d6bd11c6a36 100644 --- a/modules/integration/tests-common/integration-test-utils/pom.xml +++ b/modules/integration/tests-common/integration-test-utils/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/jacoco-report-generator/pom.xml b/modules/integration/tests-common/jacoco-report-generator/pom.xml index ba260627b59..c7e668a7a40 100644 --- a/modules/integration/tests-common/jacoco-report-generator/pom.xml +++ b/modules/integration/tests-common/jacoco-report-generator/pom.xml @@ -22,7 +22,7 @@ org.wso2.is identity-integration-tests - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index 303f1c22ee2..6f48d526bbc 100644 --- a/modules/integration/tests-common/pom.xml +++ b/modules/integration/tests-common/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml index 0a01bd787ac..64639cd5ff4 100644 --- a/modules/integration/tests-common/ui-pages/pom.xml +++ b/modules/integration/tests-common/ui-pages/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index e749240db12..31363a80bbb 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml index ebf130c74ac..4eb0b348833 100644 --- a/modules/integration/tests-integration/tests-backend/pom.xml +++ b/modules/integration/tests-integration/tests-backend/pom.xml @@ -18,7 +18,7 @@ org.wso2.is identity-integration-tests - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml index 23ef0b9c483..4feee71a839 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml @@ -37,6 +37,3 @@ federatedEmailAttributeKey = "email" EmailOTPEnableByUserClaim = true CaptureAndUpdateEmailAddress = true showEmailAddressInUI = true - -[notification_templates] -enable_unicode_support = true diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml index 42289666b32..413a298408f 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml @@ -47,6 +47,3 @@ enable_email_domain = true [identity_mgt.events.schemes.liteUserRegistration.properties] enable = true - -[notification_templates] -enable_unicode_support = true diff --git a/modules/local-authenticators/pom.xml b/modules/local-authenticators/pom.xml index fd486107350..60e6ba2324b 100644 --- a/modules/local-authenticators/pom.xml +++ b/modules/local-authenticators/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/oauth2-grant-types/pom.xml b/modules/oauth2-grant-types/pom.xml index b1eb0b673b2..8833ebf5a99 100644 --- a/modules/oauth2-grant-types/pom.xml +++ b/modules/oauth2-grant-types/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/p2-profile-gen/carbon.product b/modules/p2-profile-gen/carbon.product index bba5a4eae9c..187f39ab5f9 100644 --- a/modules/p2-profile-gen/carbon.product +++ b/modules/p2-profile-gen/carbon.product @@ -2,7 +2,7 @@ +version="4.10.30" useFeatures="true" includeLaunchers="true"> @@ -14,7 +14,7 @@ version="4.10.29" useFeatures="true" includeLaunchers="true"> - + diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index caa6a56ac84..d35d19d9455 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/provisioning-connectors/pom.xml b/modules/provisioning-connectors/pom.xml index ed021f26c51..2885474ded5 100644 --- a/modules/provisioning-connectors/pom.xml +++ b/modules/provisioning-connectors/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/social-authenticators/pom.xml b/modules/social-authenticators/pom.xml index 286a14ed4a3..4ed87d2a54e 100644 --- a/modules/social-authenticators/pom.xml +++ b/modules/social-authenticators/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml index b61cd18d5e4..6cd0dbb590a 100644 --- a/modules/styles/pom.xml +++ b/modules/styles/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml index 48b2c689457..8b40d39fe6b 100644 --- a/modules/styles/product/pom.xml +++ b/modules/styles/product/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-server-styles-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../pom.xml diff --git a/modules/tests-utils/admin-services/pom.xml b/modules/tests-utils/admin-services/pom.xml index 649145d8a74..fc9b8bd7386 100644 --- a/modules/tests-utils/admin-services/pom.xml +++ b/modules/tests-utils/admin-services/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests-utils - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../pom.xml diff --git a/modules/tests-utils/admin-stubs/pom.xml b/modules/tests-utils/admin-stubs/pom.xml index 9b3886fb271..5d6875f5a63 100644 --- a/modules/tests-utils/admin-stubs/pom.xml +++ b/modules/tests-utils/admin-stubs/pom.xml @@ -21,7 +21,7 @@ org.wso2.is identity-integration-tests-utils - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../pom.xml diff --git a/modules/tests-utils/pom.xml b/modules/tests-utils/pom.xml index 9eec7159013..e8e1554d7c1 100644 --- a/modules/tests-utils/pom.xml +++ b/modules/tests-utils/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index fe460fd06ad..febd4217d12 100755 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-server-parent pom WSO2 Identity Server - 7.1.0-m6-SNAPSHOT + 7.1.0-m7-SNAPSHOT WSO2 Identity Server http://wso2.org/projects/identity @@ -2356,7 +2356,7 @@ - 7.7.50 + 7.7.60 [5.14.67, 8.0.0) @@ -2377,7 +2377,7 @@ - 7.0.202 + 7.0.204 5.11.48 5.10.2 5.11.14 @@ -2392,13 +2392,13 @@ 5.2.5 - 5.7.5 + 5.7.6 1.7.4 1.4.6 1.9.13 - 1.9.31 + 1.9.32 @@ -2409,7 +2409,7 @@ 5.12.14 1.0.12 5.5.1 - 5.9.5 + 5.9.6 5.5.5 5.5.6 @@ -2469,7 +2469,7 @@ 2.0.17 1.3.15 - 1.3.46 + 1.3.47 5.5.9 5.5.10 @@ -2478,16 +2478,16 @@ 1.2.70 - 2.35.33 - 2.13.38 - 2.8.7 + 2.36.0 + 2.13.41 + 2.8.8 1.6.378 3.4.1 - 4.10.29 + 4.10.30 1.0.15