Merge branch 'master' of https://github.com/wso2/product-is

wso2 · Oct 26, 2023 · f1712d8 · f1712d8
2 parents 8009350 + 09aaf0c
commit f1712d8
Show file tree

Hide file tree

Showing 61 changed files with 35 additions and 163 deletions.
diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>api-resources</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>api-resources-full</artifactId>
-    <version>7.0.0-m4-SNAPSHOT</version>
+    <version>7.0.0-alpha-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>WSO2 Identity Server - All Rest API</name>

diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>api-resources</artifactId>
-    <version>7.0.0-m4-SNAPSHOT</version>
+    <version>7.0.0-alpha-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>WSO2 Identity Server - Rest API</name>

diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/callhome/pom.xml b/modules/callhome/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/distribution/src/repository/resources/conf/deployment.toml b/modules/distribution/src/repository/resources/conf/deployment.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>7.0.0-m4-SNAPSHOT</version>
+		<version>7.0.0-alpha-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/features/org.wso2.identity.ui.feature/pom.xml b/modules/features/org.wso2.identity.ui.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>7.0.0-m4-SNAPSHOT</version>
+		<version>7.0.0-alpha-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/features/org.wso2.identity.utils.feature/pom.xml b/modules/features/org.wso2.identity.utils.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>7.0.0-m4-SNAPSHOT</version>
+		<version>7.0.0-alpha-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/features/pom.xml b/modules/features/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>7.0.0-m4-SNAPSHOT</version>
+    	<version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/extensions/pom.xml b/modules/integration/tests-common/extensions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-m4-SNAPSHOT</version>
+        <version>7.0.0-alpha-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...ion/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml b/...ion/tests-backend/src/test/resources/artifacts/IS/analytics/config/analytics_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...nd/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml b/...nd/src/test/resources/artifacts/IS/analytics/config/identity_event_analytics_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...sts-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml b/...sts-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_disabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...ests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml b/...ests-backend/src/test/resources/artifacts/IS/application/mgt/role_validation_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...sts-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml b/...sts-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml
@@ -4,10 +4,6 @@ node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 disable_addressing = true
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...ests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml b/...ests-backend/src/test/resources/artifacts/IS/identityMgt/case_insensitive_user_false.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...ion/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml b/...ion/tests-backend/src/test/resources/artifacts/IS/identityMgt/user_mgt_regex_changed.toml
@@ -4,10 +4,6 @@ node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 offset = "410"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...ntegration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml b/...ntegration/tests-backend/src/test/resources/artifacts/IS/identity_encryption_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...ests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml b/...ests-integration/tests-backend/src/test/resources/artifacts/IS/identity_hash_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...ests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml b/...ests-integration/tests-backend/src/test/resources/artifacts/IS/identity_new_resource.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml b/...integration/tests-backend/src/test/resources/artifacts/IS/oauth/add_scope_deployment.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...n/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml b/...n/tests-backend/src/test/resources/artifacts/IS/oauth/jwt-token-gen-enabled-identity.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/.../src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml b/.../src/test/resources/artifacts/IS/oauth/jwt_token_issuer_add_remaining_user_attribute.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml b/...tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_convert_to_oidc.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...gration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml b/...gration/tests-backend/src/test/resources/artifacts/IS/oauth/jwt_token_issuer_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml b/...integration/tests-backend/src/test/resources/artifacts/IS/oauth/skip_consent_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...ests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml b/...ests-backend/src/test/resources/artifacts/IS/oauth/token_renewal_per_request_enabled.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...tion/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml b/...tion/tests-backend/src/test/resources/artifacts/IS/provisioning/db_separation_config.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"

diff --git a/...ests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml b/...ests-backend/src/test/resources/artifacts/IS/provisioning/default_configs_with_h2_db.toml
@@ -3,10 +3,6 @@ hostname = "localhost"
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
-[tenant_context]
-enable_tenant_qualified_urls = "true"
-enable_tenanted_sessions = "true"
-
 [super_admin]
 username = "admin"
 password = "admin"