From bafd76947fc81ff45d80b8ef6953fdbd5d7980a8 Mon Sep 17 00:00:00 2001 From: malithie Date: Fri, 13 Dec 2024 00:43:24 +0530 Subject: [PATCH 01/20] Add rule management component. Add private constructor for Query. --- .../pom.xml | 215 +++++ .../rule/management/cache/RuleCache.java | 42 + .../rule/management/cache/RuleCacheEntry.java | 48 ++ .../rule/management/cache/RuleCacheKey.java | 57 ++ .../management/constant/RuleSQLConstants.java | 74 ++ .../management/dao/RuleManagementDAO.java | 78 ++ .../impl/CacheBackedRuleManagementDAO.java | 146 ++++ .../dao/impl/RuleManagementDAOImpl.java | 282 +++++++ .../RuleManagementClientException.java | 36 + .../exception/RuleManagementException.java | 36 + .../RuleManagementServerException.java | 36 + .../RuleManagementComponentServiceHolder.java | 50 ++ .../RuleManagementServiceComponent.java | 96 +++ .../rule/management/model/Condition.java | 26 + .../rule/management/model/Expression.java | 90 +++ .../rule/management/model/FlowType.java | 27 + .../identity/rule/management/model/Rule.java | 52 ++ .../identity/rule/management/model/Value.java | 54 ++ .../model/internal/ANDCombinedRule.java | 94 +++ .../model/internal/ORCombinedRule.java | 119 +++ .../service/RuleManagementService.java | 78 ++ .../impl/RuleManagementServiceImpl.java | 135 ++++ .../rule/management/util/RuleBuilder.java | 219 ++++++ .../dao/CacheBackedRuleManagementDAOTest.java | 199 +++++ .../dao/RuleManagementDAOImplTest.java | 228 ++++++ .../RuleManagementServiceImplTest.java | 158 ++++ .../rule/management/util/RuleBuilderTest.java | 476 +++++++++++ .../resources/configs/valid-operators.json | 14 + .../src/test/resources/dbscripts/h2.sql | 17 + .../test/resources/repository/conf/carbon.xml | 686 ++++++++++++++++ .../repository/conf/identity/identity.xml | 743 ++++++++++++++++++ .../src/test/resources/testng.xml | 38 + components/rule-mgt/pom.xml | 1 + 33 files changed, 4650 insertions(+) create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCache.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCacheEntry.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCacheKey.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementClientException.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementException.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementServerException.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/internal/RuleManagementComponentServiceHolder.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/internal/RuleManagementServiceComponent.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Condition.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Expression.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/FlowType.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Rule.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Value.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/ANDCombinedRule.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/ORCombinedRule.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/RuleManagementService.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/impl/RuleManagementServiceImpl.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/util/RuleBuilder.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/dao/CacheBackedRuleManagementDAOTest.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAOImplTest.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/service/RuleManagementServiceImplTest.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/util/RuleBuilderTest.java create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/configs/valid-operators.json create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/repository/conf/carbon.xml create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/repository/conf/identity/identity.xml create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/testng.xml diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml new file mode 100644 index 000000000000..8ccd6c3efbd1 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml @@ -0,0 +1,215 @@ + + + + + + org.wso2.carbon.identity.framework + rule-mgt + 7.7.34-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.wso2.carbon.identity.rule.management + bundle + WSO2 Identity - Rule Management Component + Rule management backend component + http://wso2.org + + + + org.wso2.carbon.identity.framework + org.wso2.carbon.identity.core + + + org.wso2.carbon.identity.framework + org.wso2.carbon.identity.central.log.mgt + + + org.wso2.carbon.identity.framework + org.wso2.carbon.identity.rule.metadata + + + com.fasterxml.jackson.core + jackson-databind + + + + org.testng + testng + test + + + org.mockito + mockito-core + test + + + org.mockito + mockito-testng + test + + + com.h2database + h2 + test + + + org.wso2.carbon.identity.framework + org.wso2.carbon.identity.testutil + test + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + ${project.artifactId} + + ${project.artifactId} + + org.wso2.carbon.identity.rule.management.internal, + org.wso2.carbon.identity.rule.management.constant, + org.wso2.carbon.identity.rule.management.dao.*, + org.wso2.carbon.identity.rule.management.model.internal, + org.wso2.carbon.identity.rule.management.service.impl, + + + !org.wso2.carbon.identity.rule.management.internal, + !org.wso2.carbon.identity.rule.management.constant, + !org.wso2.carbon.identity.rule.management.dao.*, + !org.wso2.carbon.identity.rule.management.model.internal, + !org.wso2.carbon.identity.rule.management.service.impl, + org.wso2.carbon.identity.rule.management.*; + version="${carbon.identity.package.export.version}", + + + org.apache.commons.lang; version="${commons-lang.wso2.osgi.version.range}", + org.apache.commons.logging; version="${import.package.version.commons.logging}", + org.apache.commons.collections; version="${commons-collections.wso2.osgi.version.range}", + org.osgi.framework; version="${osgi.framework.imp.pkg.version.range}", + org.osgi.service.component; version="${osgi.service.component.imp.pkg.version.range}", + org.wso2.carbon.utils; version="${carbon.kernel.package.import.version.range}", + org.wso2.carbon.identity.central.log.mgt.utils; + version="${carbon.identity.package.import.version.range}", + com.fasterxml.jackson.core.*; version="${com.fasterxml.jackson.annotation.version.range}", + com.fasterxml.jackson.databind.*; + version="${com.fasterxml.jackson.annotation.version.range}", + com.fasterxml.jackson.annotation.*; + version="${com.fasterxml.jackson.annotation.version.range}", + org.wso2.carbon.database.utils.jdbc; + version="${org.wso2.carbon.database.utils.version.range}", + org.wso2.carbon.database.utils.jdbc.exceptions; + version="${org.wso2.carbon.database.utils.version.range}", + org.wso2.carbon.identity.core.cache; + version="${carbon.identity.package.import.version.range}", + org.wso2.carbon.identity.rule.metadata.*; + version="${carbon.identity.package.import.version.range}", + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.plugin.version} + + + src/test/resources/testng.xml + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + default-prepare-agent + + prepare-agent + + + + default-prepare-agent-integration + + prepare-agent-integration + + + + default-report + + report + + + + default-report-integration + + report-integration + + + + default-check + + check + + + + + BUNDLE + + + LINE + COVEREDRATIO + 0.80 + + + COMPLEXITY + COVEREDRATIO + 0.60 + + + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + + ../../../spotbugs-exclude.xml + Max + Low + true + true + + + + + diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCache.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCache.java new file mode 100644 index 000000000000..09c68b822f21 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCache.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.cache; + +import org.wso2.carbon.identity.core.cache.BaseCache; +import org.wso2.carbon.utils.CarbonUtils; + +/** + * Cache for Rule Management. + */ +public class RuleCache extends BaseCache { + + private static final String CACHE_NAME = "RuleCache"; + private static final RuleCache INSTANCE = new RuleCache(); + + public RuleCache() { + + super(CACHE_NAME); + } + + public static RuleCache getInstance() { + + CarbonUtils.checkSecurity(); + return INSTANCE; + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCacheEntry.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCacheEntry.java new file mode 100644 index 000000000000..8080bf5c2934 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCacheEntry.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.cache; + +import org.wso2.carbon.identity.core.cache.CacheEntry; +import org.wso2.carbon.identity.rule.management.model.Rule; + +/** + * Cache entry for Rule Management. + * This class is used to store Rule object in cache. + */ +public class RuleCacheEntry extends CacheEntry { + + private static final long serialVersionUID = -8205516043545934797L; + + private Rule rule; + + public RuleCacheEntry(Rule rule) { + + this.rule = rule; + } + + public Rule getRule() { + + return rule; + } + + public void setRule(Rule rule) { + + this.rule = rule; + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCacheKey.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCacheKey.java new file mode 100644 index 000000000000..2ace44abc42c --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/cache/RuleCacheKey.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.cache; + +import org.wso2.carbon.identity.core.cache.CacheKey; + +/** + * Cache key for Rule Management. + * This class is used to store Rule ID in cache. + */ +public class RuleCacheKey extends CacheKey { + + private static final long serialVersionUID = -6662958252110402724L; + + private final String ruleId; + + public RuleCacheKey(String ruleId) { + + this.ruleId = ruleId; + } + + public String getRuleId() { + + return ruleId; + } + + @Override + public boolean equals(Object o) { + + if (!(o instanceof RuleCacheKey)) { + return false; + } + return ruleId.equals(((RuleCacheKey) o).getRuleId()); + } + + @Override + public int hashCode() { + + return ruleId.hashCode(); + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java new file mode 100644 index 000000000000..3b725665f93b --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java @@ -0,0 +1,74 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.constant; + +/** + * SQL Constants for Rule Management. + * This class is used to store SQL queries and column names. + */ +public class RuleSQLConstants { + + private RuleSQLConstants() { + + } + + /** + * This class is used to store column names. + */ + public static class Column { + + public static final String UUID = "UUID"; + public static final String RULE = "RULE"; + public static final String IS_ACTIVE = "IS_ACTIVE"; + public static final String TENANT_ID = "TENANT_ID"; + public static final String RULE_REFERENCE_UUID = "RULE_UUID"; + public static final String FIELD_NAME = "FIELD_NAME"; + public static final String FIELD_REFERENCE = "FIELD_REFERENCE"; + public static final int RULE_INDEX = 2; + + private Column() { + + } + } + + /** + * This class is used to store SQL queries. + */ + public static class Query { + + public static final String ADD_RULE = "INSERT INTO IDN_RULE (UUID, RULE, IS_ACTIVE, TENANT_ID) " + + "VALUES (:UUID;, :RULE;, :IS_ACTIVE;, :TENANT_ID;)"; + public static final String ADD_RULE_REFERENCES = "INSERT INTO IDN_RULE_REFERENCES (RULE_UUID, " + + "FIELD_NAME, FIELD_REFERENCE, TENANT_ID) VALUES (:RULE_UUID;, :FIELD_NAME;, :FIELD_REFERENCE;, " + + ":TENANT_ID;)"; + public static final String UPDATE_RULE = + "UPDATE IDN_RULE SET RULE = :RULE; WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; + public static final String DELETE_RULE_REFERENCES = + "DELETE FROM IDN_RULE_REFERENCES WHERE RULE_UUID = :RULE_UUID; AND TENANT_ID = :TENANT_ID;"; + public static final String DELETE_RULE = "DELETE FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; + public static final String CHANGE_RULE_STATUS = "UPDATE IDN_RULE SET IS_ACTIVE = :IS_ACTIVE; WHERE UUID = " + + ":UUID; AND TENANT_ID = :TENANT_ID;"; + public static final String GET_RULE_BY_ID = + "SELECT RULE, IS_ACTIVE FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; + + private Query() { + + } + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java new file mode 100644 index 000000000000..f72ec5602daf --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.dao; + +import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; +import org.wso2.carbon.identity.rule.management.model.Rule; + +/** + * Rule Management DAO. + * This class is used to perform CRUD operations on Rule in the datastore. + */ +public interface RuleManagementDAO { + + /** + * Add a new Rule. + * @param rule Rule object + * @param tenantId Tenant ID + * @throws RuleManagementException Rule Management Exception + */ + public void addRule(Rule rule, int tenantId) throws RuleManagementException; + + /** + * Update an existing Rule. + * @param rule Rule object + * @param tenantId Tenant ID + * @throws RuleManagementException Rule Management Exception + */ + public void updateRule(Rule rule, int tenantId) throws RuleManagementException; + + /** + * Delete a Rule. + * @param ruleId Rule ID + * @param tenantId Tenant ID + * @throws RuleManagementException Rule Management Exception + */ + public void deleteRule(String ruleId, int tenantId) throws RuleManagementException; + + /** + * Get a Rule by Rule ID. + * @param ruleId Rule ID + * @param tenantId Tenant ID + * @return Rule object + * @throws RuleManagementException Rule Management Exception + */ + public Rule getRuleByRuleId(String ruleId, int tenantId) throws RuleManagementException; + + /** + * Activate a Rule. + * @param ruleId Rule ID + * @param tenantId Tenant ID + * @throws RuleManagementException Rule Management Exception + */ + public void activateRule(String ruleId, int tenantId) throws RuleManagementException; + + /** + * Deactivate a Rule. + * @param ruleId Rule ID + * @param tenantId Tenant ID + * @throws RuleManagementException Rule Management Exception + */ + public void deactivateRule(String ruleId, int tenantId) throws RuleManagementException; +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java new file mode 100644 index 000000000000..4eea5250544d --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java @@ -0,0 +1,146 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.dao.impl; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.identity.rule.management.cache.RuleCache; +import org.wso2.carbon.identity.rule.management.cache.RuleCacheEntry; +import org.wso2.carbon.identity.rule.management.cache.RuleCacheKey; +import org.wso2.carbon.identity.rule.management.dao.RuleManagementDAO; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; +import org.wso2.carbon.identity.rule.management.model.Rule; + +/** + * Cache backed Rule Management DAO. + * This class is used to implement the caching on top of the data layer operations. + * This caches the Rule object. + */ +public class CacheBackedRuleManagementDAO implements RuleManagementDAO { + + private static final Log LOG = LogFactory.getLog(CacheBackedRuleManagementDAO.class); + + private final RuleManagementDAO ruleManagementDAO; + private final RuleCache ruleCache; + + public CacheBackedRuleManagementDAO(RuleManagementDAO ruleManagementDAO) { + + this.ruleManagementDAO = ruleManagementDAO; + ruleCache = RuleCache.getInstance(); + } + + /** + * Add a new Rule. + * This method is used directly invokes the data layer operation to add the Rule. + * + * @param rule Rule object + * @param tenantId Tenant ID + */ + @Override + public void addRule(Rule rule, int tenantId) throws RuleManagementException { + + ruleManagementDAO.addRule(rule, tenantId); + } + + /** + * Update an existing Rule. + * This method clears the cache entry upon rule update. + * + * @param rule Rule object + * @param tenantId Tenant ID + */ + @Override + public void updateRule(Rule rule, int tenantId) throws RuleManagementException { + + ruleCache.clearCacheEntry(new RuleCacheKey(rule.getId()), tenantId); + LOG.debug("Rule cache entry is cleared for rule id: " + rule.getId() + " for rule update."); + ruleManagementDAO.updateRule(rule, tenantId); + } + + /** + * Delete a Rule. + * This method clears the cache entry upon rule deletion. + * + * @param ruleId Rule ID + * @param tenantId Tenant ID + */ + @Override + public void deleteRule(String ruleId, int tenantId) throws RuleManagementException { + + ruleCache.clearCacheEntry(new RuleCacheKey(ruleId), tenantId); + LOG.debug("Rule cache entry is cleared for rule id: " + ruleId + " for rule deletion."); + ruleManagementDAO.deleteRule(ruleId, tenantId); + } + + /** + * Get a Rule by Rule ID. + * This method first checks the cache for the Rule object. + * If the Rule object is not found in the cache, it invokes the data layer operation to get the Rule. + * + * @param ruleId Rule ID + * @param tenantId Tenant ID + * @return Rule object + */ + @Override + public Rule getRuleByRuleId(String ruleId, int tenantId) throws RuleManagementException { + + RuleCacheEntry ruleCacheEntry = RuleCache.getInstance().getValueFromCache(new RuleCacheKey(ruleId), tenantId); + if (ruleCacheEntry != null && ruleCacheEntry.getRule() != null) { + LOG.debug("Rule cache hit for rule id: " + ruleId + ". Returning from cache."); + return ruleCacheEntry.getRule(); + } + + Rule rule = ruleManagementDAO.getRuleByRuleId(ruleId, tenantId); + if (rule != null) { + LOG.debug("Rule cache miss for rule id: " + ruleId + ". Adding to cache."); + ruleCache.addToCache(new RuleCacheKey(ruleId), new RuleCacheEntry(rule), tenantId); + } + return rule; + } + + /** + * Activate a Rule. + * This method clears the cache entry upon rule activation. + * + * @param ruleId Rule ID + * @param tenantId Tenant ID + */ + @Override + public void activateRule(String ruleId, int tenantId) throws RuleManagementException { + + ruleCache.clearCacheEntry(new RuleCacheKey(ruleId), tenantId); + LOG.debug("Rule cache entry is cleared for rule id: " + ruleId + " for rule activation."); + ruleManagementDAO.activateRule(ruleId, tenantId); + } + + /** + * Deactivate a Rule. + * This method clears the cache entry upon rule deactivation. + * + * @param ruleId Rule ID + * @param tenantId Tenant ID + */ + @Override + public void deactivateRule(String ruleId, int tenantId) throws RuleManagementException { + + ruleCache.clearCacheEntry(new RuleCacheKey(ruleId), tenantId); + LOG.debug("Rule cache entry is cleared for rule id: " + ruleId + " for rule deactivation."); + ruleManagementDAO.deactivateRule(ruleId, tenantId); + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java new file mode 100644 index 000000000000..3b9b1122ff4f --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java @@ -0,0 +1,282 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.dao.impl; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.wso2.carbon.database.utils.jdbc.NamedJdbcTemplate; +import org.wso2.carbon.database.utils.jdbc.exceptions.DataAccessException; +import org.wso2.carbon.database.utils.jdbc.exceptions.TransactionException; +import org.wso2.carbon.identity.core.util.IdentityDatabaseUtil; +import org.wso2.carbon.identity.rule.management.constant.RuleSQLConstants; +import org.wso2.carbon.identity.rule.management.dao.RuleManagementDAO; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementServerException; +import org.wso2.carbon.identity.rule.management.model.Expression; +import org.wso2.carbon.identity.rule.management.model.Rule; +import org.wso2.carbon.identity.rule.management.model.Value; +import org.wso2.carbon.identity.rule.management.model.internal.ANDCombinedRule; +import org.wso2.carbon.identity.rule.management.model.internal.ORCombinedRule; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; + +/** + * Rule Management DAO Implementation. + * This class is used to perform CRUD operations on Rule in the database. + */ +public class RuleManagementDAOImpl implements RuleManagementDAO { + + /** + * This method will add the Rule to the database and add the Rule Value References to the database. + * + * @param rule Rule object + * @param tenantId Tenant ID + * @throws RuleManagementException If an error occurs while adding the rule to the database. + */ + @Override + public void addRule(Rule rule, int tenantId) throws RuleManagementException { + + try { + addRuleToDB(rule, tenantId); + addRuleValueReferencesToDB(rule, tenantId); + } catch (TransactionException e) { + throw new RuleManagementServerException("Error while creating the rule in the system.", e); + } + } + + /** + * This method will update the Rule in the database and update the Rule Value References in the database, + * by deleting all and adding back reference values for the updated rule. + * + * @param rule Rule object + * @param tenantId Tenant ID + * @throws RuleManagementException If an error occurs while updating the rule in the database. + */ + @Override + public void updateRule(Rule rule, int tenantId) throws RuleManagementException { + + try { + updateRuleInDB(rule, tenantId); + deleteRuleReferencesInDB(rule, tenantId); + addRuleValueReferencesToDB(rule, tenantId); + } catch (DataAccessException | TransactionException e) { + throw new RuleManagementServerException("Error while updating the rule in the system.", e); + } + } + + /** + * This method will delete the Rule from the database. + * + * @param ruleId Rule ID + * @param tenantId Tenant ID + * @throws RuleManagementException If an error occurs while deleting the rule from the database. + */ + @Override + public void deleteRule(String ruleId, int tenantId) throws RuleManagementException { + + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + try { + jdbcTemplate.withTransaction(template -> { + template.executeUpdate(RuleSQLConstants.Query.DELETE_RULE, + statement -> { + statement.setString(RuleSQLConstants.Column.UUID, ruleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + + return null; + }); + } catch (TransactionException e) { + throw new RuleManagementServerException("Error while deleting the rule in the system.", e); + } + } + + /** + * This method will retrieve the Rule from the database. + * + * @param ruleId Rule ID + * @param tenantId Tenant ID + * @return Rule object + * @throws RuleManagementException If an error occurs while retrieving the rule from the database. + */ + @Override + public Rule getRuleByRuleId(String ruleId, int tenantId) throws RuleManagementException { + + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + try { + String[] ruleJson = new String[1]; + boolean[] isActive = new boolean[1]; + jdbcTemplate.fetchSingleRecord(RuleSQLConstants.Query.GET_RULE_BY_ID, + (resultSet, rowNumber) -> { + ruleJson[0] = resultSet.getString(RuleSQLConstants.Column.RULE); + isActive[0] = resultSet.getBoolean(RuleSQLConstants.Column.IS_ACTIVE); + return null; + }, + statement -> { + statement.setString(RuleSQLConstants.Column.UUID, ruleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + + if (ruleJson[0] == null) { + return null; + } + + return new ORCombinedRule.Builder(convertJsonToRule(ruleJson[0])) + .setId(ruleId) + .setActive(isActive[0]) + .build(); + } catch (DataAccessException e) { + throw new RuleManagementServerException("Error while retrieving the rule from the system.", e); + } + } + + /** + * This method will activate the Rule in the database. + * + * @param ruleId Rule ID + * @param tenantId Tenant ID + * @throws RuleManagementException If an error occurs while activating the rule in the database. + */ + @Override + public void activateRule(String ruleId, int tenantId) throws RuleManagementException { + + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + try { + jdbcTemplate.executeUpdate(RuleSQLConstants.Query.CHANGE_RULE_STATUS, + statement -> { + statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, true); + statement.setString(RuleSQLConstants.Column.UUID, ruleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + } catch (DataAccessException e) { + throw new RuleManagementServerException("Error while deactivating the rule in the system.", e); + } + } + + /** + * This method will deactivate the Rule in the database. + * + * @param ruleId Rule ID + * @param tenantId Tenant ID + * @throws RuleManagementException If an error occurs while deactivating the rule in the database. + */ + @Override + public void deactivateRule(String ruleId, int tenantId) throws RuleManagementException { + + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + try { + jdbcTemplate.executeUpdate(RuleSQLConstants.Query.CHANGE_RULE_STATUS, + statement -> { + statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, false); + statement.setString(RuleSQLConstants.Column.UUID, ruleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + } catch (DataAccessException e) { + throw new RuleManagementServerException("Error while deactivating the rule in the system.", e); + } + } + + private void addRuleToDB(Rule rule, int tenantId) throws TransactionException, RuleManagementServerException { + + InputStream ruleJson = convertRuleToJson(rule); + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + jdbcTemplate.withTransaction(template -> { + template.executeInsert(RuleSQLConstants.Query.ADD_RULE, + statement -> { + statement.setString(RuleSQLConstants.Column.UUID, rule.getId()); + statement.setBlob(RuleSQLConstants.Column.RULE_INDEX, ruleJson); + statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, rule.isActive()); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }, rule, false); + return null; + }); + } + + private void addRuleValueReferencesToDB(Rule rule, int tenantId) throws TransactionException { + + ORCombinedRule orCombinedRule = (ORCombinedRule) rule; + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + jdbcTemplate.withTransaction(template -> { + template.executeBatchInsert(RuleSQLConstants.Query.ADD_RULE_REFERENCES, + statement -> { + for (ANDCombinedRule rule1 : orCombinedRule.getRules()) { + for (Expression expression : rule1.getExpressions()) { + if (expression.getValue().getType() == Value.Type.REFERENCE) { + statement.setString(RuleSQLConstants.Column.RULE_REFERENCE_UUID, rule.getId()); + statement.setString(RuleSQLConstants.Column.FIELD_NAME, expression.getField()); + statement.setString(RuleSQLConstants.Column.FIELD_REFERENCE, + expression.getValue().getFieldValue()); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + statement.addBatch(); + } + } + } + }, null); + return null; + }); + } + + private void updateRuleInDB(Rule rule, int tenantId) throws DataAccessException, RuleManagementServerException { + + InputStream ruleJson = convertRuleToJson(rule); + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + jdbcTemplate.executeUpdate(RuleSQLConstants.Query.UPDATE_RULE, + statement -> { + statement.setBlob(1, ruleJson); + statement.setString(RuleSQLConstants.Column.UUID, rule.getId()); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + } + + private void deleteRuleReferencesInDB(Rule rule, int tenantId) + throws TransactionException { + + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + jdbcTemplate.withTransaction(template -> { + template.executeUpdate(RuleSQLConstants.Query.DELETE_RULE_REFERENCES, + statement -> { + statement.setString(RuleSQLConstants.Column.RULE_REFERENCE_UUID, rule.getId()); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + + return null; + }); + } + + private InputStream convertRuleToJson(Rule rule) throws RuleManagementServerException { + + try { + ObjectMapper objectMapper = new ObjectMapper(); + return new ByteArrayInputStream(objectMapper.writeValueAsString(rule).getBytes(StandardCharsets.UTF_8)); + } catch (JsonProcessingException e) { + throw new RuleManagementServerException("Failed to convert rule to JSON.", e); + } + } + + private ORCombinedRule convertJsonToRule(String ruleJson) throws RuleManagementServerException { + + try { + ObjectMapper objectMapper = new ObjectMapper(); + return objectMapper.readValue(ruleJson, ORCombinedRule.class); + } catch (JsonProcessingException e) { + throw new RuleManagementServerException("Failed to convert JSON to rule.", e); + } + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementClientException.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementClientException.java new file mode 100644 index 000000000000..2375fcef1fba --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementClientException.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.exception; + +/** + * Rule Management Client Exception. + * This class is used to handle client exceptions in Rule Management. + */ +public class RuleManagementClientException extends RuleManagementException { + + public RuleManagementClientException(String message) { + + super(message); + } + + public RuleManagementClientException(String message, Throwable cause) { + + super(message, cause); + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementException.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementException.java new file mode 100644 index 000000000000..f821bf7db653 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementException.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.exception; + +/** + * Rule Management Exception. + * This class is used to handle exceptions in Rule Management. + */ +public class RuleManagementException extends Exception { + + public RuleManagementException(String message) { + + super(message); + } + + public RuleManagementException(String message, Throwable cause) { + + super(message, cause); + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementServerException.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementServerException.java new file mode 100644 index 000000000000..fe214941bb6e --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/exception/RuleManagementServerException.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.exception; + +/** + * Rule Management Server Exception. + * This class is used to handle server exceptions in Rule Management. + */ +public class RuleManagementServerException extends RuleManagementException { + + public RuleManagementServerException(String message) { + + super(message); + } + + public RuleManagementServerException(String message, Throwable cause) { + + super(message, cause); + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/internal/RuleManagementComponentServiceHolder.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/internal/RuleManagementComponentServiceHolder.java new file mode 100644 index 000000000000..f64827a3eeec --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/internal/RuleManagementComponentServiceHolder.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.internal; + +import org.wso2.carbon.identity.rule.metadata.service.RuleMetadataService; + +/** + * Rule Management Component Service Holder. + */ +public class RuleManagementComponentServiceHolder { + + private static final RuleManagementComponentServiceHolder INSTANCE = new RuleManagementComponentServiceHolder(); + + private RuleMetadataService ruleMetadataService; + + private RuleManagementComponentServiceHolder() { + + } + + public static RuleManagementComponentServiceHolder getInstance() { + + return INSTANCE; + } + + public RuleMetadataService getRuleMetadataService() { + + return ruleMetadataService; + } + + public void setRuleMetadataService(RuleMetadataService ruleMetadataService) { + + this.ruleMetadataService = ruleMetadataService; + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/internal/RuleManagementServiceComponent.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/internal/RuleManagementServiceComponent.java new file mode 100644 index 000000000000..5d42ce9675de --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/internal/RuleManagementServiceComponent.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.internal; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.osgi.framework.BundleContext; +import org.osgi.service.component.ComponentContext; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Deactivate; +import org.osgi.service.component.annotations.Reference; +import org.osgi.service.component.annotations.ReferenceCardinality; +import org.osgi.service.component.annotations.ReferencePolicy; +import org.wso2.carbon.identity.rule.management.service.RuleManagementService; +import org.wso2.carbon.identity.rule.management.service.impl.RuleManagementServiceImpl; +import org.wso2.carbon.identity.rule.metadata.service.RuleMetadataService; + +/** + * Rule Management Service Component. + */ +@Component( + name = "rule.management.service.component", + immediate = true +) +public class RuleManagementServiceComponent { + + private static final Log LOG = LogFactory.getLog(RuleManagementServiceComponent.class); + + @Activate + protected void activate(ComponentContext context) { + + try { + BundleContext bundleCtx = context.getBundleContext(); + + bundleCtx.registerService(RuleManagementService.class.getName(), + RuleManagementServiceImpl.getInstance(), null); + LOG.debug("Rule management bundle is activated."); + } catch (Throwable e) { + LOG.error("Error while initializing rule management service component.", e); + } + } + + @Deactivate + protected void deactivate(ComponentContext context) { + + try { + BundleContext bundleCtx = context.getBundleContext(); + bundleCtx.ungetService(bundleCtx.getServiceReference(RuleManagementService.class)); + LOG.debug("Rule management bundle is deactivated."); + } catch (Throwable e) { + LOG.error("Error while deactivating rule management service component.", e); + } + } + + @Reference( + name = "rule.metadata.service.component", + service = RuleMetadataService.class, + cardinality = ReferenceCardinality.MANDATORY, + policy = ReferencePolicy.DYNAMIC, + unbind = "unsetRuleMetadataService" + ) + protected void setRuleMetadataService(RuleMetadataService ruleMetadataService) { + + if (LOG.isDebugEnabled()) { + LOG.debug("Registering a reference for RuleMetadataService in the rule management service component."); + } + + RuleManagementComponentServiceHolder.getInstance().setRuleMetadataService(ruleMetadataService); + } + + protected void unsetRuleMetadataService(RuleMetadataService ruleMetadataService) { + + if (LOG.isDebugEnabled()) { + LOG.debug("Unregistering a reference for RuleMetadataService in the rule management service component."); + } + + RuleManagementComponentServiceHolder.getInstance().setRuleMetadataService(null); + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Condition.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Condition.java new file mode 100644 index 000000000000..21b27ea43915 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Condition.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.model; + +/** + * This class is used to define the conditions in Rule Management. + */ +public enum Condition { + AND, OR +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Expression.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Expression.java new file mode 100644 index 000000000000..d68cd2372a5c --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Expression.java @@ -0,0 +1,90 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.model; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; + +/** + * Represents an expression in Rule Management. + * This class has a field, an operator and a value. + */ +@JsonDeserialize(builder = Expression.Builder.class) +public class Expression { + + private final String field; + private final String operator; + private final Value value; + + private Expression(Builder builder) { + + this.field = builder.field; + this.operator = builder.operator; + this.value = builder.value; + } + + public String getField() { + + return field; + } + + public String getOperator() { + + return operator; + } + + public Value getValue() { + + return value; + } + + /** + * Builder for the Expression. + */ + @JsonPOJOBuilder(withPrefix = "") + public static class Builder { + + private String field; + private String operator; + private Value value; + + public Builder field(String field) { + + this.field = field; + return this; + } + + public Builder operator(String operator) { + + this.operator = operator; + return this; + } + + public Builder value(Value value) { + + this.value = value; + return this; + } + + public Expression build() { + + return new Expression(this); + } + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/FlowType.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/FlowType.java new file mode 100644 index 000000000000..5f8d469f8b8e --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/FlowType.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.model; + +/** + * This class is used to define the flow types in Rule Management. + */ +public enum FlowType { + + PRE_ISSUE_ACCESS_TOKEN; +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Rule.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Rule.java new file mode 100644 index 000000000000..b752a68834b9 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Rule.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.model; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +/** + * Represents a rule in Rule Management. + * This class has an id, a condition and a status. + */ +public abstract class Rule { + + protected String id; + protected Condition condition; + protected boolean isActive; + + /** + * @JsonIgnore annotation is used to ignore the id field when serializing and deserializing the object, + * to and from JSON in order to store in the database. + */ + @JsonIgnore + public String getId() { + + return id; + } + + /** + * @JsonIgnore annotation is used to ignore the active field when serializing and deserializing the object, + * to and from JSON in order to store in the database. + */ + @JsonIgnore + public boolean isActive() { + + return isActive; + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Value.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Value.java new file mode 100644 index 000000000000..0549ee2bcc60 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/Value.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.model; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Represents a value in Rule Management. + * This class has a type and a value. + */ +public class Value { + + private final Type type; + private final String fieldValue; + + @JsonCreator + public Value(@JsonProperty("type") Type type, @JsonProperty("value") String fieldValue) { + + this.type = type; + this.fieldValue = fieldValue; + } + + public Type getType() { + return type; + } + + public String getFieldValue() { + return fieldValue; + } + + /** + * Represents the type of the value. + */ + public enum Type { + STRING, NUMBER, BOOLEAN, DATE_TIME, REFERENCE + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/ANDCombinedRule.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/ANDCombinedRule.java new file mode 100644 index 000000000000..9bdc57381cfb --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/ANDCombinedRule.java @@ -0,0 +1,94 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.model.internal; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; +import org.wso2.carbon.identity.rule.management.model.Condition; +import org.wso2.carbon.identity.rule.management.model.Expression; +import org.wso2.carbon.identity.rule.management.model.Rule; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + * Represents an AND combined rule. + * This class extends the Rule class and has a list of expressions. + */ +@JsonDeserialize(builder = ANDCombinedRule.Builder.class) +public class ANDCombinedRule extends Rule { + + private final List expressions; + + private ANDCombinedRule(Builder builder) { + + this.id = builder.id; + this.expressions = builder.expressions; + this.condition = Condition.AND; + this.isActive = true; + } + + public Condition getCondition() { + + return condition; + } + + public List getExpressions() { + + return expressions; + } + + /** + * Builder for the ANDCombinedRule. + */ + @JsonPOJOBuilder(withPrefix = "set") + public static class Builder { + + private String id; + private List expressions = new ArrayList<>(); + + public Builder addExpression(Expression expression) { + + expressions.add(expression); + return this; + } + + public Builder setCondition(Condition condition) { + + if (condition != Condition.AND) { + throw new IllegalArgumentException("Condition must be AND for ANDCombinedRule"); + } + + return this; + } + + public Builder setExpressions(List expressions) { + + this.expressions = expressions; + return this; + } + + public ANDCombinedRule build() { + + this.id = UUID.randomUUID().toString(); + return new ANDCombinedRule(this); + } + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/ORCombinedRule.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/ORCombinedRule.java new file mode 100644 index 000000000000..85124b6a5606 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/ORCombinedRule.java @@ -0,0 +1,119 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.model.internal; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; +import org.wso2.carbon.identity.rule.management.model.Condition; +import org.wso2.carbon.identity.rule.management.model.Rule; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + * Represents an OR combined rule. + * This class extends the Rule class and has a list of ANDCombinedRules. + */ +@JsonDeserialize(builder = ORCombinedRule.Builder.class) +public class ORCombinedRule extends Rule { + + private List rules; + + /** + * Builder for the ORCombinedRule. + */ + private ORCombinedRule(Builder builder) { + + this.id = builder.id; + this.isActive = builder.isActive; + this.rules = builder.rules; + this.condition = Condition.OR; + } + + public Condition getCondition() { + + return condition; + } + + public List getRules() { + + return rules; + } + + /** + * Builder for the ORCombinedRule. + */ + @JsonPOJOBuilder(withPrefix = "set") + public static class Builder { + + private String id; + private boolean isActive = true; + private List rules = new ArrayList<>(); + + public Builder() { + + } + + public Builder(ORCombinedRule orCombinedRule) { + + this.id = orCombinedRule.id; + this.rules = orCombinedRule.rules; + } + + public Builder addRule(ANDCombinedRule andCombinedRule) { + + rules.add(andCombinedRule); + return this; + } + + public Builder setId(String id) { + + this.id = id; + return this; + } + + public Builder setActive(boolean isActive) { + + this.isActive = isActive; + return this; + } + + public Builder setCondition(Condition condition) { + + if (condition != Condition.OR) { + throw new IllegalArgumentException("Condition must be OR for ORCombinedRule"); + } + + return this; + } + + public Builder setRules(List rules) { + + this.rules = rules; + return this; + } + + public ORCombinedRule build() { + + this.id = (this.id == null) ? UUID.randomUUID().toString() : this.id; + return new ORCombinedRule(this); + } + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/RuleManagementService.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/RuleManagementService.java new file mode 100644 index 000000000000..57f1b9678bdf --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/RuleManagementService.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.service; + +import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; +import org.wso2.carbon.identity.rule.management.model.Rule; + +/** + * This interface is used to define the Rule Management Service. + * This interface has the methods to add, update, delete, get and deactivate rules. + */ +public interface RuleManagementService { + + /** + * Adds a new rule. + * + * @param rule Rule to be added. + * @param tenantDomain Tenant domain. + * @return Added rule. + * @throws RuleManagementException If an error occurs while adding the rule. + */ + public Rule addRule(Rule rule, String tenantDomain) throws RuleManagementException; + + /** + * Updates an existing rule. + * + * @param rule Rule to be updated. + * @param tenantDomain Tenant domain. + * @return Updated rule. + * @throws RuleManagementException If an error occurs while updating the rule. + */ + public Rule updateRule(Rule rule, String tenantDomain) throws RuleManagementException; + + /** + * Deletes a rule. + * + * @param ruleId Rule ID. + * @param tenantDomain Tenant domain. + * @throws RuleManagementException If an error occurs while deleting the rule. + */ + public void deleteRule(String ruleId, String tenantDomain) throws RuleManagementException; + + /** + * Retrieves a rule by rule ID. + * + * @param ruleId Rule ID. + * @param tenantDomain Tenant domain. + * @return Rule. + * @throws RuleManagementException If an error occurs while retrieving the rule. + */ + public Rule getRuleByRuleId(String ruleId, String tenantDomain) throws RuleManagementException; + + /** + * Deactivates a rule. + * + * @param ruleId Rule ID. + * @param tenantDomain Tenant domain. + * @return Deactivated rule. + * @throws RuleManagementException If an error occurs while deactivating the rule. + */ + public Rule deactivateRule(String ruleId, String tenantDomain) throws RuleManagementException; +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/impl/RuleManagementServiceImpl.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/impl/RuleManagementServiceImpl.java new file mode 100644 index 000000000000..f3a82db6906a --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/impl/RuleManagementServiceImpl.java @@ -0,0 +1,135 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.service.impl; + +import org.wso2.carbon.identity.core.util.IdentityTenantUtil; +import org.wso2.carbon.identity.rule.management.dao.RuleManagementDAO; +import org.wso2.carbon.identity.rule.management.dao.impl.CacheBackedRuleManagementDAO; +import org.wso2.carbon.identity.rule.management.dao.impl.RuleManagementDAOImpl; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementClientException; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; +import org.wso2.carbon.identity.rule.management.model.Rule; +import org.wso2.carbon.identity.rule.management.service.RuleManagementService; + +/** + * Implementation of Rule Management Service. + */ +public class RuleManagementServiceImpl implements RuleManagementService { + + private static final RuleManagementServiceImpl ruleManagementService = new RuleManagementServiceImpl(); + private final RuleManagementDAO ruleManagementDAO; + + private RuleManagementServiceImpl() { + + ruleManagementDAO = new CacheBackedRuleManagementDAO(new RuleManagementDAOImpl()); + } + + public static RuleManagementServiceImpl getInstance() { + + return ruleManagementService; + } + + /** + * Add a new rule. + * + * @param rule Rule to be added. + * @param tenantDomain Tenant domain. + * @return Added rule. + */ + @Override + public Rule addRule(Rule rule, String tenantDomain) throws RuleManagementException { + + int tenantId = IdentityTenantUtil.getTenantId(tenantDomain); + ruleManagementDAO.addRule(rule, tenantId); + return ruleManagementDAO.getRuleByRuleId(rule.getId(), tenantId); + } + + /** + * Update an existing rule. + * + * @param rule Rule to be updated. + * @param tenantDomain Tenant domain. + * @return Updated rule. + */ + @Override + public Rule updateRule(Rule rule, String tenantDomain) throws RuleManagementException { + + validateIfRuleExists(rule.getId(), tenantDomain); + + ruleManagementDAO.updateRule(rule, IdentityTenantUtil.getTenantId(tenantDomain)); + return ruleManagementDAO.getRuleByRuleId(rule.getId(), IdentityTenantUtil.getTenantId(tenantDomain)); + } + + /** + * Delete a rule. + * + * @param ruleId Rule ID. + * @param tenantDomain Tenant domain. + */ + @Override + public void deleteRule(String ruleId, String tenantDomain) throws RuleManagementException { + + if (isRuleExists(ruleId, tenantDomain)) { + ruleManagementDAO.deleteRule(ruleId, IdentityTenantUtil.getTenantId(tenantDomain)); + } + } + + /** + * Retrieve a rule by rule ID. + * + * @param ruleId Rule ID. + * @param tenantDomain Tenant domain. + * @return Rule. + */ + @Override + public Rule getRuleByRuleId(String ruleId, String tenantDomain) throws RuleManagementException { + + return ruleManagementDAO.getRuleByRuleId(ruleId, IdentityTenantUtil.getTenantId(tenantDomain)); + } + + /** + * Deactivate a rule. + * + * @param ruleId Rule ID. + * @param tenantDomain Tenant domain. + * @return Deactivated rule. + */ + @Override + public Rule deactivateRule(String ruleId, String tenantDomain) throws RuleManagementException { + + validateIfRuleExists(ruleId, tenantDomain); + + ruleManagementDAO.deactivateRule(ruleId, IdentityTenantUtil.getTenantId(tenantDomain)); + return ruleManagementDAO.getRuleByRuleId(ruleId, IdentityTenantUtil.getTenantId(tenantDomain)); + } + + private void validateIfRuleExists(String ruleId, String tenantDomain) throws RuleManagementException { + + if (!isRuleExists(ruleId, tenantDomain)) { + throw new RuleManagementClientException("Rule not found for the given rule id: " + ruleId); + } + } + + private boolean isRuleExists(String ruleId, String tenantDomain) throws RuleManagementException { + + Rule existingRule = + ruleManagementDAO.getRuleByRuleId(ruleId, IdentityTenantUtil.getTenantId(tenantDomain)); + return existingRule != null; + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/util/RuleBuilder.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/util/RuleBuilder.java new file mode 100644 index 000000000000..e970988d53cd --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/util/RuleBuilder.java @@ -0,0 +1,219 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.util; + +import org.wso2.carbon.identity.rule.management.exception.RuleManagementClientException; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementServerException; +import org.wso2.carbon.identity.rule.management.internal.RuleManagementComponentServiceHolder; +import org.wso2.carbon.identity.rule.management.model.Expression; +import org.wso2.carbon.identity.rule.management.model.FlowType; +import org.wso2.carbon.identity.rule.management.model.Rule; +import org.wso2.carbon.identity.rule.management.model.internal.ANDCombinedRule; +import org.wso2.carbon.identity.rule.management.model.internal.ORCombinedRule; +import org.wso2.carbon.identity.rule.metadata.exception.RuleMetadataException; +import org.wso2.carbon.identity.rule.metadata.model.FieldDefinition; +import org.wso2.carbon.identity.rule.metadata.model.OptionsInputValue; + +import java.util.List; +import java.util.Map; + +/** + * RuleBuilder class is used to build a rule. + * The RuleBuilder instance can be created using the create method for a given flow type and tenant domain. + * This class provides methods to add expressions and conditions to the rule and to build the rule. + * Validations are done while adding expressions and conditions to the rule. + */ +public class RuleBuilder { + + private static final int MAX_EXPRESSIONS_COMBINED_WITH_AND = 5; + private static final int MAX_RULES_COMBINED_WITH_OR = 10; + + private final ORCombinedRule.Builder orCombinedRuleBuilder = new ORCombinedRule.Builder(); + private ANDCombinedRule.Builder andCombinedRuleBuilder = new ANDCombinedRule.Builder(); + private final Map expressionMetadataFieldsMap; + + private boolean isError = false; + private String errorMessage; + + private int andRuleCount = 0; + private int orRuleCount = 0; + + private RuleBuilder(List expressionMetadataFields) { + + this.expressionMetadataFieldsMap = expressionMetadataFields.stream() + .collect(java.util.stream.Collectors.toMap(fieldDefinition -> fieldDefinition.getField().getName(), + fieldDefinition -> fieldDefinition)); + } + + /** + * Add an expression to the rule. + * + * @param expression Expression to be added. + * @return RuleBuilder + */ + public RuleBuilder addAndExpression(Expression expression) { + + validateExpression(expression); + addExpressionForANDCombinedRule(expression); + validateMaxAllowedANDCombinedExpressions(); + return this; + } + + /** + * Add an OR condition to the rule. + * + * @return RuleBuilder + */ + public RuleBuilder addOrCondition() { + + addORCombinedRule(); + validateMaxAllowedORCombinedRules(); + initANDCombinedRule(); + return this; + } + + /** + * Build the rule. + * + * @return Rule + * @throws RuleManagementClientException If an error occurs while building the rule. + */ + public Rule build() throws RuleManagementClientException { + + if (isError) { + // The very first validation error will be thrown as an exception. + throw new RuleManagementClientException( + "Building rule failed due to validation errors. Error: " + errorMessage); + } + + orCombinedRuleBuilder.addRule(andCombinedRuleBuilder.build()); + return orCombinedRuleBuilder.build(); + } + + /** + * Create a RuleBuilder instance. + * + * @param flowType Flow type. + * @param tenantDomain Tenant domain. + * @return RuleBuilder + * @throws RuleManagementException If an error occurs while creating the RuleBuilder instance. + */ + public static RuleBuilder create(FlowType flowType, String tenantDomain) throws RuleManagementException { + + try { + List fieldDefinitionList = + RuleManagementComponentServiceHolder.getInstance().getRuleMetadataService() + .getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.valueOf(flowType.name()), + tenantDomain); + + if (fieldDefinitionList == null || fieldDefinitionList.isEmpty()) { + throw new RuleManagementClientException( + "Expression metadata from RuleMetadataService is null or empty."); + } + + return new RuleBuilder(fieldDefinitionList); + } catch (RuleMetadataException e) { + throw new RuleManagementServerException( + "Error while retrieving expression metadata from RuleMetadataService.", e); + } + } + + private void addExpressionForANDCombinedRule(Expression expression) { + + andCombinedRuleBuilder.addExpression(expression); + andRuleCount++; + } + + private void initANDCombinedRule() { + + andCombinedRuleBuilder = new ANDCombinedRule.Builder(); + andRuleCount = 0; + } + + private void addORCombinedRule() { + + orCombinedRuleBuilder.addRule(andCombinedRuleBuilder.build()); + orRuleCount++; + } + + private void validateExpression(Expression expression) { + + FieldDefinition fieldDefinition = expressionMetadataFieldsMap.get(expression.getField()); + + if (isError) { + return; + } + + if (fieldDefinition == null) { + setValidationError("Field " + expression.getField() + " is not supported"); + return; + } + + if (fieldDefinition.getOperators().stream() + .noneMatch(operator -> operator.getName().equals(expression.getOperator()))) { + setValidationError("Operator " + expression.getOperator() + " is not supported for field " + + expression.getField()); + return; + } + + if (!fieldDefinition.getValue().getValueType().name().equals(expression.getValue().getType().name())) { + setValidationError("Value type " + expression.getValue().getType().name() + " is not supported for field " + + expression.getField()); + } + + if (fieldDefinition.getValue() instanceof OptionsInputValue && + ((OptionsInputValue) fieldDefinition.getValue()).getValues().stream().noneMatch( + optionsValue -> optionsValue.getName().equals(expression.getValue().getFieldValue()))) { + setValidationError("Value " + expression.getValue().getFieldValue() + " is not supported for field " + + expression.getField()); + } + } + + private void validateMaxAllowedANDCombinedExpressions() { + + if (isError) { + return; + } + + if (andRuleCount > MAX_EXPRESSIONS_COMBINED_WITH_AND) { + setValidationError("Maximum number of expressions combined with AND exceeded. Maximum allowed: " + + MAX_EXPRESSIONS_COMBINED_WITH_AND + " Provided: " + andRuleCount); + } + } + + private void validateMaxAllowedORCombinedRules() { + + if (isError) { + return; + } + + if (orRuleCount > MAX_RULES_COMBINED_WITH_OR) { + setValidationError("Maximum number of rules combined with OR exceeded. Maximum allowed: " + + MAX_RULES_COMBINED_WITH_OR + " Provided: " + orRuleCount); + } + } + + private void setValidationError(String message) { + + isError = true; + errorMessage = message; + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/dao/CacheBackedRuleManagementDAOTest.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/dao/CacheBackedRuleManagementDAOTest.java new file mode 100644 index 000000000000..fbe7f6661041 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/dao/CacheBackedRuleManagementDAOTest.java @@ -0,0 +1,199 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.dao; + +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.wso2.carbon.identity.common.testng.WithCarbonHome; +import org.wso2.carbon.identity.common.testng.WithRealmService; +import org.wso2.carbon.identity.core.internal.IdentityCoreServiceDataHolder; +import org.wso2.carbon.identity.rule.management.cache.RuleCache; +import org.wso2.carbon.identity.rule.management.cache.RuleCacheEntry; +import org.wso2.carbon.identity.rule.management.cache.RuleCacheKey; +import org.wso2.carbon.identity.rule.management.dao.impl.CacheBackedRuleManagementDAO; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; +import org.wso2.carbon.identity.rule.management.model.Rule; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + +@WithCarbonHome +@WithRealmService(injectToSingletons = {IdentityCoreServiceDataHolder.class}) +public class CacheBackedRuleManagementDAOTest { + + private RuleManagementDAO ruleManagementDAO; + private CacheBackedRuleManagementDAO cacheBackedRuleManagementDAO; + private RuleCache ruleCache; + + public static final String RULE_ID = "ruleId"; + public static final int TENANT_ID = 1; + + @BeforeClass + public void setUpClass() { + + ruleCache = RuleCache.getInstance(); + } + + @BeforeMethod + public void setUp() { + + ruleManagementDAO = mock(RuleManagementDAO.class); + cacheBackedRuleManagementDAO = new CacheBackedRuleManagementDAO(ruleManagementDAO); + } + + @Test + public void testAddRule() throws RuleManagementException { + + Rule rule = mock(Rule.class); + + cacheBackedRuleManagementDAO.addRule(rule, TENANT_ID); + + verify(ruleManagementDAO).addRule(rule, TENANT_ID); + } + + @Test + public void testUpdateRule() throws RuleManagementException { + + Rule rule = mock(Rule.class); + when(rule.getId()).thenReturn(RULE_ID); + + cacheBackedRuleManagementDAO.updateRule(rule, TENANT_ID); + + verify(ruleManagementDAO).updateRule(rule, TENANT_ID); + assertNull(ruleCache.getValueFromCache(new RuleCacheKey(RULE_ID), TENANT_ID)); + } + + @Test + public void testUpdateRuleWhenCacheIsPopulated() throws RuleManagementException { + + Rule rule = mock(Rule.class); + when(rule.getId()).thenReturn(RULE_ID); + RuleCacheEntry cacheEntry = new RuleCacheEntry(rule); + ruleCache.addToCache(new RuleCacheKey(RULE_ID), cacheEntry, TENANT_ID); + + cacheBackedRuleManagementDAO.updateRule(rule, TENANT_ID); + + verify(ruleManagementDAO).updateRule(rule, TENANT_ID); + assertNull(ruleCache.getValueFromCache(new RuleCacheKey(RULE_ID), TENANT_ID)); + } + + @Test + public void testDeleteRule() throws RuleManagementException { + + cacheBackedRuleManagementDAO.deleteRule(RULE_ID, TENANT_ID); + + verify(ruleManagementDAO).deleteRule(RULE_ID, TENANT_ID); + assertNull(ruleCache.getValueFromCache(new RuleCacheKey(RULE_ID), TENANT_ID)); + } + + @Test + public void testDeleteRuleWhenCacheIsPopulated() throws RuleManagementException { + + Rule rule = mock(Rule.class); + when(rule.getId()).thenReturn(RULE_ID); + RuleCacheEntry cacheEntry = new RuleCacheEntry(rule); + ruleCache.addToCache(new RuleCacheKey(RULE_ID), cacheEntry, TENANT_ID); + + cacheBackedRuleManagementDAO.deleteRule(RULE_ID, TENANT_ID); + + verify(ruleManagementDAO).deleteRule(RULE_ID, TENANT_ID); + assertNull(ruleCache.getValueFromCache(new RuleCacheKey(RULE_ID), TENANT_ID)); + } + + @Test + public void testGetRuleByRuleIdCacheHit() throws RuleManagementException { + + Rule rule = mock(Rule.class); + RuleCacheEntry cacheEntry = new RuleCacheEntry(rule); + ruleCache.addToCache(new RuleCacheKey(RULE_ID), cacheEntry, TENANT_ID); + + Rule result = cacheBackedRuleManagementDAO.getRuleByRuleId(RULE_ID, TENANT_ID); + + assertEquals(result, rule); + verify(ruleManagementDAO, never()).getRuleByRuleId(RULE_ID, TENANT_ID); + } + + @Test + public void testGetRuleByRuleIdCacheMiss() throws RuleManagementException { + + ruleCache.clear(TENANT_ID); + + Rule rule = mock(Rule.class); + when(rule.getId()).thenReturn(RULE_ID); + when(ruleManagementDAO.getRuleByRuleId(RULE_ID, TENANT_ID)).thenReturn(rule); + + Rule result = cacheBackedRuleManagementDAO.getRuleByRuleId(RULE_ID, TENANT_ID); + + assertEquals(result, rule); + verify(ruleManagementDAO).getRuleByRuleId(RULE_ID, TENANT_ID); + // Verify that the rule is added to the cache + assertEquals(rule, ruleCache.getValueFromCache(new RuleCacheKey(RULE_ID), TENANT_ID).getRule()); + } + + @Test + public void testActivateRule() throws RuleManagementException { + + cacheBackedRuleManagementDAO.activateRule(RULE_ID, TENANT_ID); + + verify(ruleManagementDAO).activateRule(RULE_ID, TENANT_ID); + assertNull(ruleCache.getValueFromCache(new RuleCacheKey(RULE_ID), TENANT_ID)); + } + + @Test + public void testActivateRuleWhenCacheIsPopulated() throws RuleManagementException { + + Rule rule = mock(Rule.class); + when(rule.getId()).thenReturn(RULE_ID); + RuleCacheEntry cacheEntry = new RuleCacheEntry(rule); + ruleCache.addToCache(new RuleCacheKey(RULE_ID), cacheEntry, TENANT_ID); + + cacheBackedRuleManagementDAO.activateRule(RULE_ID, TENANT_ID); + + verify(ruleManagementDAO).activateRule(RULE_ID, TENANT_ID); + assertNull(ruleCache.getValueFromCache(new RuleCacheKey(RULE_ID), TENANT_ID)); + } + + @Test + public void testDeactivateRule() throws RuleManagementException { + + cacheBackedRuleManagementDAO.deactivateRule(RULE_ID, TENANT_ID); + + verify(ruleManagementDAO).deactivateRule(RULE_ID, TENANT_ID); + assertNull(ruleCache.getValueFromCache(new RuleCacheKey(RULE_ID), TENANT_ID)); + } + + @Test + public void testDeactivateRuleWhenCacheIsPopulated() throws RuleManagementException { + + Rule rule = mock(Rule.class); + when(rule.getId()).thenReturn(RULE_ID); + RuleCacheEntry cacheEntry = new RuleCacheEntry(rule); + ruleCache.addToCache(new RuleCacheKey(RULE_ID), cacheEntry, TENANT_ID); + + cacheBackedRuleManagementDAO.deactivateRule(RULE_ID, TENANT_ID); + + verify(ruleManagementDAO).deactivateRule(RULE_ID, TENANT_ID); + assertNull(ruleCache.getValueFromCache(new RuleCacheKey(RULE_ID), TENANT_ID)); + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAOImplTest.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAOImplTest.java new file mode 100644 index 000000000000..63a54980ec53 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAOImplTest.java @@ -0,0 +1,228 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.dao; + +import org.testng.annotations.Test; +import org.wso2.carbon.identity.common.testng.WithCarbonHome; +import org.wso2.carbon.identity.common.testng.WithH2Database; +import org.wso2.carbon.identity.rule.management.dao.impl.RuleManagementDAOImpl; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; +import org.wso2.carbon.identity.rule.management.model.Expression; +import org.wso2.carbon.identity.rule.management.model.Rule; +import org.wso2.carbon.identity.rule.management.model.Value; +import org.wso2.carbon.identity.rule.management.model.internal.ANDCombinedRule; +import org.wso2.carbon.identity.rule.management.model.internal.ORCombinedRule; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; + +@WithH2Database(files = {"dbscripts/h2.sql"}) +@WithCarbonHome +public class RuleManagementDAOImplTest { + + public static final int TENANT_ID = 1; + private Rule createdRule; + RuleManagementDAOImpl ruleManagementDAOImpl = new RuleManagementDAOImpl(); + + @Test + public void testAddRule() throws RuleManagementException { + + Expression expression1 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp1")).build(); + + Expression expression2 = new Expression.Builder().field("grantType").operator("equals") + .value(new Value(Value.Type.STRING, "authorization_code")).build(); + ANDCombinedRule andCombinedRule1 = + new ANDCombinedRule.Builder().addExpression(expression1).addExpression(expression2).build(); + + Expression expression3 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp2")).build(); + ANDCombinedRule andCombinedRule2 = + new ANDCombinedRule.Builder().addExpression(expression3).build(); + + ORCombinedRule orCombinedRule = + new ORCombinedRule.Builder().addRule(andCombinedRule1).addRule(andCombinedRule2).build(); + + ruleManagementDAOImpl.addRule(orCombinedRule, TENANT_ID); + + createdRule = ruleManagementDAOImpl.getRuleByRuleId(orCombinedRule.getId(), TENANT_ID); + assertNotNull(createdRule); + assertEquals(orCombinedRule.getId(), createdRule.getId()); + assertTrue(createdRule.isActive()); + + ORCombinedRule retrievedORCombinedRule = assertOrCombinedRule(createdRule, 2); + ANDCombinedRule retrievedAndCombinedRule1 = assertAndCombinedRule(retrievedORCombinedRule.getRules().get(0), 2); + assertExpressions(retrievedAndCombinedRule1, expression1, expression2); + ANDCombinedRule retrievedAndCombinedRule2 = assertAndCombinedRule(retrievedORCombinedRule.getRules().get(1), 1); + assertExpressions(retrievedAndCombinedRule2, expression3); + } + + @Test(dependsOnMethods = {"testAddRule"}) + public void testAddRuleWithMultipleExpressionsUsingSameFieldReferenceAndOR() throws RuleManagementException { + + Expression expression1 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp1")).build(); + + Expression expression2 = new Expression.Builder().field("grantType").operator("equals") + .value(new Value(Value.Type.STRING, "authorization_code")).build(); + + ANDCombinedRule andCombinedRule1 = + new ANDCombinedRule.Builder().addExpression(expression1).addExpression(expression2).build(); + + Expression expression3 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp1")).build(); + + Expression expression4 = new Expression.Builder().field("grantType").operator("equals") + .value(new Value(Value.Type.STRING, "client_credentials")).build(); + + ANDCombinedRule andCombinedRule2 = + new ANDCombinedRule.Builder().addExpression(expression3).addExpression(expression4).build(); + + Expression expression5 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp2")).build(); + ANDCombinedRule andCombinedRule3 = + new ANDCombinedRule.Builder().addExpression(expression5).build(); + + ORCombinedRule orCombinedRule = + new ORCombinedRule.Builder().addRule(andCombinedRule1).addRule(andCombinedRule2) + .addRule(andCombinedRule3).build(); + + ruleManagementDAOImpl.addRule(orCombinedRule, TENANT_ID); + + createdRule = ruleManagementDAOImpl.getRuleByRuleId(orCombinedRule.getId(), TENANT_ID); + assertNotNull(createdRule); + assertEquals(orCombinedRule.getId(), createdRule.getId()); + assertTrue(createdRule.isActive()); + + ORCombinedRule retrievedORCombinedRule = assertOrCombinedRule(createdRule, 3); + ANDCombinedRule retrievedAndCombinedRule1 = assertAndCombinedRule(retrievedORCombinedRule.getRules().get(0), 2); + assertExpressions(retrievedAndCombinedRule1, expression1, expression2); + ANDCombinedRule retrievedAndCombinedRule2 = assertAndCombinedRule(retrievedORCombinedRule.getRules().get(1), 2); + assertExpressions(retrievedAndCombinedRule2, expression3, expression4); + ANDCombinedRule retrievedAndCombinedRule3 = assertAndCombinedRule(retrievedORCombinedRule.getRules().get(2), 1); + assertExpressions(retrievedAndCombinedRule3, expression5); + } + + @Test(dependsOnMethods = {"testAddRuleWithMultipleExpressionsUsingSameFieldReferenceAndOR"}) + public void testUpdateRule() throws RuleManagementException { + + Expression expression1 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp1")).build(); + + Expression expression2 = new Expression.Builder().field("grantType").operator("equals") + .value(new Value(Value.Type.STRING, "password")).build(); + ANDCombinedRule andCombinedRule1 = + new ANDCombinedRule.Builder().addExpression(expression1).addExpression(expression2).build(); + + Expression expression3 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp2")).build(); + ANDCombinedRule andCombinedRule2 = + new ANDCombinedRule.Builder().addExpression(expression3).build(); + + Expression expression4 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp4")).build(); + ANDCombinedRule andCombinedRule3 = + new ANDCombinedRule.Builder().addExpression(expression4).build(); + + ORCombinedRule orCombinedRule = + new ORCombinedRule.Builder().setId(createdRule.getId()).addRule(andCombinedRule1) + .addRule(andCombinedRule2) + .addRule(andCombinedRule3).build(); + + ruleManagementDAOImpl.updateRule(orCombinedRule, TENANT_ID); + + Rule updatedRule = ruleManagementDAOImpl.getRuleByRuleId(createdRule.getId(), TENANT_ID); + assertNotNull(updatedRule); + assertEquals(createdRule.getId(), updatedRule.getId()); + assertTrue(updatedRule.isActive()); + + ORCombinedRule retrievedORCombinedRule = assertOrCombinedRule(updatedRule, 3); + ANDCombinedRule retrievedAndCombinedRule1 = assertAndCombinedRule(retrievedORCombinedRule.getRules().get(0), 2); + assertExpressions(retrievedAndCombinedRule1, expression1, expression2); + ANDCombinedRule retrievedAndCombinedRule2 = assertAndCombinedRule(retrievedORCombinedRule.getRules().get(1), 1); + assertExpressions(retrievedAndCombinedRule2, expression3); + ANDCombinedRule retrievedAndCombinedRule3 = assertAndCombinedRule(retrievedORCombinedRule.getRules().get(2), 1); + assertExpressions(retrievedAndCombinedRule3, expression4); + } + + @Test(dependsOnMethods = {"testUpdateRule"}) + public void testDeactivateRule() throws RuleManagementException { + + ruleManagementDAOImpl.deactivateRule(createdRule.getId(), TENANT_ID); + Rule deactivatedRule = ruleManagementDAOImpl.getRuleByRuleId(createdRule.getId(), TENANT_ID); + assertNotNull(deactivatedRule); + assertEquals(deactivatedRule.getId(), createdRule.getId()); + assertFalse(deactivatedRule.isActive()); + } + + @Test(dependsOnMethods = {"testDeactivateRule"}) + public void testActivateRule() throws RuleManagementException { + + ruleManagementDAOImpl.activateRule(createdRule.getId(), TENANT_ID); + Rule activatedRule = ruleManagementDAOImpl.getRuleByRuleId(createdRule.getId(), TENANT_ID); + assertNotNull(activatedRule); + assertEquals(activatedRule.getId(), createdRule.getId()); + assertTrue(activatedRule.isActive()); + } + + @Test(dependsOnMethods = {"testActivateRule"}) + public void testDeleteRule() throws RuleManagementException { + + ruleManagementDAOImpl.deleteRule(createdRule.getId(), TENANT_ID); + Rule deletedRule = ruleManagementDAOImpl.getRuleByRuleId(createdRule.getId(), TENANT_ID); + assertNull(deletedRule); + } + + private static void assertExpressions(ANDCombinedRule andCombinedRule, Expression... expressions) { + + assertEquals(andCombinedRule.getExpressions().size(), expressions.length); + for (int i = 0; i < expressions.length; i++) { + assertEquals(andCombinedRule.getExpressions().get(i).getField(), expressions[i].getField()); + assertEquals(andCombinedRule.getExpressions().get(i).getOperator(), expressions[i].getOperator()); + assertEquals(andCombinedRule.getExpressions().get(i).getValue().getType(), + expressions[i].getValue().getType()); + assertEquals(andCombinedRule.getExpressions().get(i).getValue().getFieldValue(), + expressions[i].getValue().getFieldValue()); + } + } + + private static ANDCombinedRule assertAndCombinedRule(Rule andRule, int expectedExpressionsSize) { + + assertTrue(andRule instanceof ANDCombinedRule); + + ANDCombinedRule andCombinedRule = (ANDCombinedRule) andRule; + assertNotNull(andCombinedRule.getId()); + assertTrue(andCombinedRule.isActive()); + assertNotNull(andCombinedRule.getExpressions()); + assertEquals(andCombinedRule.getExpressions().size(), expectedExpressionsSize); + return andCombinedRule; + } + + private static ORCombinedRule assertOrCombinedRule(Rule rule, int expectedRulesSize) { + + assertTrue(rule instanceof ORCombinedRule); + ORCombinedRule orCombinedRule = (ORCombinedRule) rule; + assertNotNull(orCombinedRule.getRules()); + assertEquals(orCombinedRule.getRules().size(), expectedRulesSize); + return orCombinedRule; + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/service/RuleManagementServiceImplTest.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/service/RuleManagementServiceImplTest.java new file mode 100644 index 000000000000..f32f420ff919 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/service/RuleManagementServiceImplTest.java @@ -0,0 +1,158 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.service; + +import org.mockito.MockedStatic; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.wso2.carbon.identity.common.testng.WithCarbonHome; +import org.wso2.carbon.identity.common.testng.WithRealmService; +import org.wso2.carbon.identity.core.internal.IdentityCoreServiceDataHolder; +import org.wso2.carbon.identity.core.util.IdentityTenantUtil; +import org.wso2.carbon.identity.rule.management.dao.RuleManagementDAO; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementClientException; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; +import org.wso2.carbon.identity.rule.management.model.Rule; +import org.wso2.carbon.identity.rule.management.service.impl.RuleManagementServiceImpl; + +import java.lang.reflect.Field; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; + +@WithCarbonHome +@WithRealmService(injectToSingletons = {IdentityCoreServiceDataHolder.class}) +public class RuleManagementServiceImplTest { + + private RuleManagementServiceImpl ruleManagementService; + private RuleManagementDAO ruleManagementDAO; + + private MockedStatic identityTenantUtilMockedStatic; + + public static final String RULE_ID = "ruleId"; + public static final String TENANT_DOMAIN = "test.com"; + public static final int TENANT_ID = 1; + + @BeforeClass + public void setUpClass() { + + ruleManagementService = RuleManagementServiceImpl.getInstance(); + + identityTenantUtilMockedStatic = mockStatic(IdentityTenantUtil.class); + when(IdentityTenantUtil.getTenantId(TENANT_DOMAIN)).thenReturn(TENANT_ID); + } + + @AfterClass + public void tearDownClass() { + + identityTenantUtilMockedStatic.close(); + } + + @BeforeMethod + public void setUp() throws Exception { + + ruleManagementDAO = mock(RuleManagementDAO.class); + Field daoField = RuleManagementServiceImpl.class.getDeclaredField("ruleManagementDAO"); + daoField.setAccessible(true); + daoField.set(ruleManagementService, ruleManagementDAO); + } + + @Test + public void testAddRule() throws RuleManagementException { + + Rule rule = mock(Rule.class); + when(rule.getId()).thenReturn(RULE_ID); + + when(ruleManagementDAO.getRuleByRuleId(RULE_ID, TENANT_ID)).thenReturn(rule); + + Rule result = ruleManagementService.addRule(rule, TENANT_DOMAIN); + + verify(ruleManagementDAO).addRule(rule, TENANT_ID); + verify(ruleManagementDAO).getRuleByRuleId(RULE_ID, TENANT_ID); + + assertEquals(result, rule); + } + + @Test + public void testUpdateRule() throws RuleManagementException { + + Rule rule = mock(Rule.class); + when(rule.getId()).thenReturn(RULE_ID); + when(ruleManagementDAO.getRuleByRuleId(RULE_ID, TENANT_ID)).thenReturn(rule); + + Rule result = ruleManagementService.updateRule(rule, TENANT_DOMAIN); + + verify(ruleManagementDAO).updateRule(rule, TENANT_ID); + verify(ruleManagementDAO, times(2)).getRuleByRuleId(RULE_ID, TENANT_ID); + assertEquals(result, rule); + } + + @Test + public void testDeleteRule() throws RuleManagementException { + + Rule rule = mock(Rule.class); + when(ruleManagementDAO.getRuleByRuleId(RULE_ID, TENANT_ID)).thenReturn(rule); + + ruleManagementService.deleteRule(RULE_ID, TENANT_DOMAIN); + + verify(ruleManagementDAO).deleteRule(RULE_ID, TENANT_ID); + } + + @Test + public void testGetRuleByRuleId() throws RuleManagementException { + + Rule rule = mock(Rule.class); + when(ruleManagementDAO.getRuleByRuleId(RULE_ID, TENANT_ID)).thenReturn(rule); + + Rule result = ruleManagementService.getRuleByRuleId(RULE_ID, TENANT_DOMAIN); + + verify(ruleManagementDAO).getRuleByRuleId(RULE_ID, TENANT_ID); + assertEquals(result, rule); + } + + @Test + public void testDeactivateRule() throws RuleManagementException { + + Rule rule = mock(Rule.class); + when(ruleManagementDAO.getRuleByRuleId(RULE_ID, TENANT_ID)).thenReturn(rule); + + Rule result = ruleManagementService.deactivateRule(RULE_ID, TENANT_DOMAIN); + + verify(ruleManagementDAO).deactivateRule(RULE_ID, TENANT_ID); + verify(ruleManagementDAO, times(2)).getRuleByRuleId(RULE_ID, TENANT_ID); + assertEquals(result, rule); + } + + @Test(expectedExceptions = RuleManagementClientException.class, expectedExceptionsMessageRegExp = + "Rule not found for the given rule id: " + RULE_ID) + public void testUpdateIfRuleNotExist() throws RuleManagementException { + + when(ruleManagementDAO.getRuleByRuleId(RULE_ID, TENANT_ID)).thenReturn(null); + + Rule rule = mock(Rule.class); + when(rule.getId()).thenReturn(RULE_ID); + ruleManagementService.updateRule(rule, TENANT_DOMAIN); + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/util/RuleBuilderTest.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/util/RuleBuilderTest.java new file mode 100644 index 000000000000..dc8751dc2d91 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/java/org/wso2/carbon/identity/rule/management/util/RuleBuilderTest.java @@ -0,0 +1,476 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.util; + +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.MockitoAnnotations; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementClientException; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementServerException; +import org.wso2.carbon.identity.rule.management.internal.RuleManagementComponentServiceHolder; +import org.wso2.carbon.identity.rule.management.model.Expression; +import org.wso2.carbon.identity.rule.management.model.FlowType; +import org.wso2.carbon.identity.rule.management.model.Rule; +import org.wso2.carbon.identity.rule.management.model.Value; +import org.wso2.carbon.identity.rule.management.model.internal.ANDCombinedRule; +import org.wso2.carbon.identity.rule.management.model.internal.ORCombinedRule; +import org.wso2.carbon.identity.rule.metadata.config.OperatorConfig; +import org.wso2.carbon.identity.rule.metadata.config.RuleMetadataConfigFactory; +import org.wso2.carbon.identity.rule.metadata.exception.RuleMetadataException; +import org.wso2.carbon.identity.rule.metadata.model.Field; +import org.wso2.carbon.identity.rule.metadata.model.FieldDefinition; +import org.wso2.carbon.identity.rule.metadata.model.Link; +import org.wso2.carbon.identity.rule.metadata.model.Operator; +import org.wso2.carbon.identity.rule.metadata.model.OptionsInputValue; +import org.wso2.carbon.identity.rule.metadata.model.OptionsReferenceValue; +import org.wso2.carbon.identity.rule.metadata.model.OptionsValue; +import org.wso2.carbon.identity.rule.metadata.service.RuleMetadataService; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + +public class RuleBuilderTest { + + @Mock + RuleMetadataService ruleMetadataService; + private MockedStatic ruleMetadataConfigFactoryMockedStatic; + OperatorConfig operatorConfig; + + @BeforeClass + public void setUpClass() throws Exception { + + String filePath = Objects.requireNonNull(getClass().getClassLoader().getResource( + "configs/valid-operators.json")).getFile(); + operatorConfig = OperatorConfig.load(new File(filePath)); + } + + @BeforeMethod + public void setUpMethod() { + + ruleMetadataConfigFactoryMockedStatic = mockStatic(RuleMetadataConfigFactory.class); + ruleMetadataConfigFactoryMockedStatic.when(RuleMetadataConfigFactory::getOperatorConfig) + .thenReturn(operatorConfig); + + MockitoAnnotations.openMocks(this); + RuleManagementComponentServiceHolder.getInstance().setRuleMetadataService(ruleMetadataService); + } + + @AfterMethod + public void tearDownMethod() { + + ruleMetadataConfigFactoryMockedStatic.close(); + } + + @Test(expectedExceptions = RuleManagementClientException.class, + expectedExceptionsMessageRegExp = "Expression metadata from RuleMetadataService is null or empty.") + public void testCreateRuleBuilderWhenExpressionMetaReturnedFromMetadataServiceIsNull() + throws Exception { + + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")).thenReturn( + null); + + RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + } + + @Test(expectedExceptions = RuleManagementClientException.class, + expectedExceptionsMessageRegExp = "Expression metadata from RuleMetadataService is null or empty.") + public void testCreateRuleBuilderWhenExpressionMetaReturnedFromMetadataServiceIsEmpty() + throws Exception { + + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")).thenReturn( + Collections.emptyList()); + + RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + } + + @Test(expectedExceptions = RuleManagementServerException.class, + expectedExceptionsMessageRegExp = "Error while retrieving expression metadata from RuleMetadataService.") + public void testCreateRuleBuilderWhenMetadataServiceThrowsException() + throws Exception { + + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")).thenThrow( + new RuleMetadataException("RULEMETA-60005", "Error while retrieving expression metadata.", + "Failed to load data from configurations.")); + + RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + } + + @Test + public void testCreateRuleBuilder() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")).thenReturn( + mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + assertNotNull(ruleBuilder); + } + + @Test + public void testCreateRuleWithValidExpressions() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")).thenReturn( + mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + + Expression expression1 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp")).build(); + ruleBuilder.addAndExpression(expression1); + + Expression expression2 = new Expression.Builder().field("grantType").operator("equals") + .value(new Value(Value.Type.STRING, "authorization_code")).build(); + ruleBuilder.addAndExpression(expression2); + Rule rule = ruleBuilder.build(); + + assertNotNull(rule); + assertNotNull(rule.getId()); + assertTrue(rule.isActive()); + + ORCombinedRule orCombinedRule = assertOrCombinedRule(rule, 1); + + orCombinedRule.getRules() + .forEach(andRule -> assertExpressions(assertAndCombinedRule(andRule, 2), expression1, expression2)); + } + + @Test(expectedExceptions = RuleManagementClientException.class, + expectedExceptionsMessageRegExp = "Building rule failed due to validation errors. " + + "Error: Field invalid is not supported") + public void testCreateRuleWithAnExpressionWithInvalidField() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")).thenReturn( + mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + + Expression expression = new Expression.Builder().field("invalid").operator("equals") + .value(new Value(Value.Type.STRING, "value")).build(); + ruleBuilder.addAndExpression(expression); + + ruleBuilder.build(); + } + + @Test(expectedExceptions = RuleManagementClientException.class, + expectedExceptionsMessageRegExp = "Building rule failed due to validation errors. " + + "Error: Operator invalid is not supported for field application") + public void testCreateRuleWithAnExpressionWithInvalidOperator() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")) + .thenReturn(mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + + Expression expression = new Expression.Builder().field("application").operator("invalid") + .value(new Value(Value.Type.STRING, "value")).build(); + ruleBuilder.addAndExpression(expression); + + ruleBuilder.build(); + } + + @Test(expectedExceptions = RuleManagementClientException.class, + expectedExceptionsMessageRegExp = "Building rule failed due to validation errors. " + + "Error: Value invalid is not supported for field grantType") + public void testCreateRuleWithAnExpressionWithInvalidValue() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")) + .thenReturn(mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + + Expression expression = new Expression.Builder().field("grantType").operator("equals") + .value(new Value(Value.Type.STRING, "invalid")).build(); + ruleBuilder.addAndExpression(expression); + + ruleBuilder.build(); + } + + @Test(expectedExceptions = RuleManagementClientException.class, + expectedExceptionsMessageRegExp = "Building rule failed due to validation errors. " + + "Error: Value type STRING is not supported for field application") + public void testCreateRuleWithAnExpressionWithInvalidValueType() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")) + .thenReturn(mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + + Expression expression = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.STRING, "testapp")).build(); + ruleBuilder.addAndExpression(expression); + + ruleBuilder.build(); + } + + /** + * This test case is to test the scenario where multiple validation failures occur when building a rule. + * In this case, only the very first validation failure is expected to be thrown. + * + * @throws Exception Client exception when building the rule + */ + @Test(expectedExceptions = RuleManagementClientException.class, + expectedExceptionsMessageRegExp = "Building rule failed due to validation errors. " + + "Error: Field invalid is not supported") + public void testCreateRuleWithMultipleValidationFailures() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")) + .thenReturn(mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + + // Expression with invalid field + Expression expression1 = new Expression.Builder().field("invalid").operator("equals") + .value(new Value(Value.Type.STRING, "value")).build(); + ruleBuilder.addAndExpression(expression1); + + // Expression with invalid operator + Expression expression2 = new Expression.Builder().field("grantType").operator("equals") + .value(new Value(Value.Type.STRING, "invalid")).build(); + ruleBuilder.addAndExpression(expression2); + + ruleBuilder.addOrCondition(); + + // Expression with invalid value type + Expression expression3 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.STRING, "testapp")).build(); + ruleBuilder.addAndExpression(expression3); + + ruleBuilder.build(); + } + + @Test(expectedExceptions = RuleManagementClientException.class, + expectedExceptionsMessageRegExp = "Building rule failed due to validation errors. " + + "Error: Maximum number of expressions combined with AND exceeded. Maximum allowed: 5 Provided: 6") + public void testCreateRuleWithMaxAllowedExpressionsCombinedWithAND() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")).thenReturn( + mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + + for (int i = 0; i < 6; i++) { + Expression expression = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp" + i)).build(); + ruleBuilder.addAndExpression(expression); + } + + ruleBuilder.build(); + } + + @Test(expectedExceptions = RuleManagementClientException.class, + expectedExceptionsMessageRegExp = "Building rule failed due to validation errors. " + + "Error: Maximum number of rules combined with OR exceeded. Maximum allowed: 10 Provided: 11") + public void testCreateRuleWithMaxAllowedRulesCombinedWithOR() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")).thenReturn( + mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + + for (int i = 0; i < 11; i++) { + Expression expression = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp" + i)).build(); + ruleBuilder.addAndExpression(expression); + ruleBuilder.addOrCondition(); + } + + ruleBuilder.build(); + } + + @Test + public void testCreateRuleWithValidExpressionsAndOR() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")).thenReturn( + mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + + Expression expression1 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp1")).build(); + ruleBuilder.addAndExpression(expression1); + + Expression expression2 = new Expression.Builder().field("grantType").operator("equals") + .value(new Value(Value.Type.STRING, "authorization_code")).build(); + ruleBuilder.addAndExpression(expression2); + + ruleBuilder.addOrCondition(); + + Expression expression3 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp2")).build(); + ruleBuilder.addAndExpression(expression3); + + Rule rule = ruleBuilder.build(); + + assertNotNull(rule); + assertNotNull(rule.getId()); + assertTrue(rule.isActive()); + + ORCombinedRule orCombinedRule = assertOrCombinedRule(rule, 2); + ANDCombinedRule andCombinedRule = assertAndCombinedRule(orCombinedRule.getRules().get(0), 2); + assertExpressions(andCombinedRule, expression1, expression2); + + andCombinedRule = assertAndCombinedRule(orCombinedRule.getRules().get(1), 1); + assertExpressions(andCombinedRule, expression3); + } + + @Test + public void testCreateRuleWithMultipleExpressionsUsingSameFieldReferenceAndOR() throws Exception { + + List mockedFieldDefinitions = getMockedFieldDefinitions(); + when(ruleMetadataService.getExpressionMeta( + org.wso2.carbon.identity.rule.metadata.model.FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1")).thenReturn( + mockedFieldDefinitions); + + RuleBuilder ruleBuilder = RuleBuilder.create(FlowType.PRE_ISSUE_ACCESS_TOKEN, "tenant1"); + + Expression expression1 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp1")).build(); + ruleBuilder.addAndExpression(expression1); + + Expression expression2 = new Expression.Builder().field("grantType").operator("equals") + .value(new Value(Value.Type.STRING, "authorization_code")).build(); + ruleBuilder.addAndExpression(expression2); + + ruleBuilder.addOrCondition(); + + Expression expression3 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp1")).build(); + ruleBuilder.addAndExpression(expression3); + + Expression expression4 = new Expression.Builder().field("grantType").operator("equals") + .value(new Value(Value.Type.STRING, "client_credentials")).build(); + ruleBuilder.addAndExpression(expression4); + + ruleBuilder.addOrCondition(); + + Expression expression5 = new Expression.Builder().field("application").operator("equals") + .value(new Value(Value.Type.REFERENCE, "testapp2")).build(); + ruleBuilder.addAndExpression(expression5); + + Rule rule = ruleBuilder.build(); + + assertNotNull(rule); + assertNotNull(rule.getId()); + assertTrue(rule.isActive()); + + ORCombinedRule orCombinedRule = assertOrCombinedRule(rule, 3); + ANDCombinedRule andCombinedRule = assertAndCombinedRule(orCombinedRule.getRules().get(0), 2); + assertExpressions(andCombinedRule, expression1, expression2); + + andCombinedRule = assertAndCombinedRule(orCombinedRule.getRules().get(1), 2); + assertExpressions(andCombinedRule, expression3, expression4); + + andCombinedRule = assertAndCombinedRule(orCombinedRule.getRules().get(2), 1); + assertExpressions(andCombinedRule, expression5); + } + + private List getMockedFieldDefinitions() { + + List fieldDefinitionList = new ArrayList<>(); + + Field applicationField = new Field("application", "application"); + List operators = Arrays.asList(new Operator("equals", "equals"), + new Operator("notEquals", "not equals")); + + List links = Arrays.asList(new Link("/applications?offset=0&limit=10", "GET", "values"), + new Link("/applications?filter=name+eq+*&limit=10", "GET", "filter")); + org.wso2.carbon.identity.rule.metadata.model.Value + applicationValue = new OptionsReferenceValue.Builder().valueReferenceAttribute("id") + .valueDisplayAttribute("name").valueType( + org.wso2.carbon.identity.rule.metadata.model.Value.ValueType.REFERENCE).links(links).build(); + fieldDefinitionList.add(new FieldDefinition(applicationField, operators, applicationValue)); + + Field grantTypeField = new Field("grantType", "grantType"); + List optionsValues = Arrays.asList(new OptionsValue("authorization_code", "authorization code"), + new OptionsValue("password", "password"), new OptionsValue("refresh_token", "refresh token"), + new OptionsValue("client_credentials", "client credentials"), + new OptionsValue("urn:ietf:params:oauth:grant-type:token-exchange", "token exchange")); + org.wso2.carbon.identity.rule.metadata.model.Value + grantTypeValue = + new OptionsInputValue(org.wso2.carbon.identity.rule.metadata.model.Value.ValueType.STRING, + optionsValues); + fieldDefinitionList.add(new FieldDefinition(grantTypeField, operators, grantTypeValue)); + + return fieldDefinitionList; + } + + private static void assertExpressions(ANDCombinedRule andCombinedRule, Expression... expressions) { + + assertEquals(andCombinedRule.getExpressions().size(), expressions.length); + for (int i = 0; i < expressions.length; i++) { + assertEquals(andCombinedRule.getExpressions().get(i), expressions[i]); + } + } + + private static ANDCombinedRule assertAndCombinedRule(Rule andRule, int expectedExpressionsSize) { + + assertTrue(andRule instanceof ANDCombinedRule); + + ANDCombinedRule andCombinedRule = (ANDCombinedRule) andRule; + assertNotNull(andCombinedRule.getId()); + assertTrue(andCombinedRule.isActive()); + assertNotNull(andCombinedRule.getExpressions()); + assertEquals(andCombinedRule.getExpressions().size(), expectedExpressionsSize); + return andCombinedRule; + } + + private static ORCombinedRule assertOrCombinedRule(Rule rule, int expectedRulesSize) { + + assertTrue(rule instanceof ORCombinedRule); + ORCombinedRule orCombinedRule = (ORCombinedRule) rule; + assertNotNull(orCombinedRule.getRules()); + assertEquals(orCombinedRule.getRules().size(), expectedRulesSize); + return orCombinedRule; + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/configs/valid-operators.json b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/configs/valid-operators.json new file mode 100644 index 000000000000..440832b8f460 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/configs/valid-operators.json @@ -0,0 +1,14 @@ +{ + "equals": { + "name": "equals", + "displayName": "equals" + }, + "notEquals": { + "name": "notEquals", + "displayName": "not equals" + }, + "contains": { + "name": "contains", + "displayName": "contains" + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql new file mode 100644 index 000000000000..4bf9a5334b30 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql @@ -0,0 +1,17 @@ +CREATE TABLE IF NOT EXISTS IDN_RULE ( + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (UUID) +); + +CREATE TABLE IF NOT EXISTS IDN_RULE_REFERENCES ( + ID INTEGER NOT NULL AUTO_INCREMENT, + RULE_UUID CHAR(36) NOT NULL, + FIELD_NAME VARCHAR(100) NOT NULL, + FIELD_REFERENCE VARCHAR(255) NOT NULL, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (ID), + FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE +); diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/repository/conf/carbon.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/repository/conf/carbon.xml new file mode 100644 index 000000000000..a5a1a6470cbc --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/repository/conf/carbon.xml @@ -0,0 +1,686 @@ + + + + + + + + WSO2 Identity Server + + + IS + + + 5.3.0 + + + localhost + + + localhost + + + local:/${carbon.context}/services/ + + + + + + + IdentityServer + + + + + + + org.wso2.carbon + + + / + + + + + + + + + 15 + + + + + + + + + 0 + + + + + 9999 + + 11111 + + + + + + 10389 + + 8000 + + + + + + 10500 + + + + + + + + + org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory + + + + + + + + + java + + + + + + + + + + false + + + false + + + 600 + + + + false + + + + + + + + 30 + + + + + + + + + 15 + + + + + + ${carbon.home}/repository/deployment/server/ + + + 15 + + + ${carbon.home}/repository/conf/axis2/axis2.xml + + + 30000 + + + ${carbon.home}/repository/deployment/client/ + + ${carbon.home}/repository/conf/axis2/axis2_client.xml + + true + + + + + + + + + + admin + Default Administrator Role + + + user + Default User Role + + + + + + + + + + + + ${carbon.home}/repository/resources/security/wso2carbon.jks + + JKS + + wso2carbon + + wso2carbon + + wso2carbon + + + + + + ${carbon.home}/repository/resources/security/client-truststore.jks + + JKS + + wso2carbon + + + + + + + + + + + + + + + + + + + UserManager + + + false + + org.wso2.carbon.identity.provider.AttributeCallbackHandler + + + org.wso2.carbon.identity.sts.store.DBTokenStore + + + true + allow + + + + + + + claim_mgt_menu + identity_mgt_emailtemplate_menu + identity_security_questions_menu + + + + ${carbon.home}/tmp/work + + + + + + true + + + 10 + + + 30 + + + + + + 100 + + + + keystore + certificate + * + + org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor + + + + + jarZip + + org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor + + + + dbs + + org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor + + + + tools + + org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor + + + + toolsAny + + org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor + + + + + + + + + + info + org.wso2.carbon.core.transports.util.InfoProcessor + + + wsdl + org.wso2.carbon.core.transports.util.Wsdl11Processor + + + wsdl2 + org.wso2.carbon.core.transports.util.Wsdl20Processor + + + xsd + org.wso2.carbon.core.transports.util.XsdProcessor + + + + + + false + false + true + svn + http://svnrepo.example.com/repos/ + username + password + true + + + + + + + + + + + + + + + ${require.carbon.servlet} + + + + + true + + + + + + + default repository + http://product-dist.wso2.com/p2/carbon/releases/wilkes/ + + + + + + + + true + + + + + + true + + diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/repository/conf/identity/identity.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/repository/conf/identity/identity.xml new file mode 100644 index 000000000000..07de6831dbf4 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/repository/conf/identity/identity.xml @@ -0,0 +1,743 @@ + + + + + + + + + jdbc/WSO2IdentityDB + + + + + true + true + 0 + + true + 20160 + 1140 + + + true + 720 + + + + + + + 15 + 20160 + + + + + + ${carbon.home}/conf/keystores + SunX509 + SunX509 + + + + SelfAndManaged + CertValidate + + + + + + + + + + + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/openidserver + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/openid + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/authenticationendpoint/openid_login.do + + + false + + 7200 + + false + + + + + + + + + + + + + + + + + + + + + + -1 + -1 + -1 + -1 + + + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth/request-token + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth/authorize-url + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth/access-token + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/authorize + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/token + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/revoke + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/introspect + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/userinfo + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oidc/checksession + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oidc/logout + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/authenticationendpoint/oauth2_authz.do + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/authenticationendpoint/oauth2_error.do + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/authenticationendpoint/oauth2_consent.do + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/authenticationendpoint/oauth2_logout_consent.do + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/authenticationendpoint/oauth2_logout.do + + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/.well-known/webfinger + + + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/identity/connect/register + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/jwks + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/oidcdiscovery + + + 300 + + 3600 + + 3600 + + 84600 + + 300 + + false + + true + + org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor + + + + false + + + + + + token + org.wso2.carbon.identity.oauth2.authz.handlers.AccessTokenResponseTypeHandler + + + code + org.wso2.carbon.identity.oauth2.authz.handlers.CodeResponseTypeHandler + + + id_token + org.wso2.carbon.identity.oauth2.authz.handlers.IDTokenResponseTypeHandler + + + id_token token + org.wso2.carbon.identity.oauth2.authz.handlers.IDTokenTokenResponseTypeHandler + + + + + + authorization_code + org.wso2.carbon.identity.oauth2.token.handlers.grant.AuthorizationCodeGrantHandler + + + password + org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler + + + refresh_token + org.wso2.carbon.identity.oauth2.token.handlers.grant.RefreshGrantHandler + + + client_credentials + org.wso2.carbon.identity.oauth2.token.handlers.grant.ClientCredentialsGrantHandler + + + urn:ietf:params:oauth:grant-type:saml2-bearer + org.wso2.carbon.identity.oauth2.token.handlers.grant.saml.SAML2BearerGrantHandler + + + iwa:ntlm + org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandler + + + idTokenNotAllowedGrantType + org.wso2.carbon.identity.oauth2.token.handlers.grant.idTokenNotAllowedGrantHandler + false + + + + + + + + + false + + + + false + + + + false + org.wso2.carbon.identity.oauth2.authcontext.JWTTokenGenerator + org.wso2.carbon.identity.oauth2.authcontext.DefaultClaimsRetriever + http://wso2.org/claims + SHA256withRSA + 10 + + + + + + org.wso2.carbon.identity.openidconnect.DefaultIDTokenBuilder + SHA256withRSA + + + + + + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/oauth2/token + org.wso2.carbon.identity.openidconnect.DefaultOIDCClaimsCallbackHandler + 3600 + org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoUserStoreClaimRetriever + org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInforRequestDefaultValidator + org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoISAccessTokenValidator + org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoJSONResponseBuilder + false + + + + + + + + gtalk + talk.google.com + 5222 + gmail.com + multifactor1@gmail.com + wso2carbon + + + + + + 157680000 + 157680000 + ${carbon.host} + + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/samlsso + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/authenticationendpoint/samlsso_logout.do + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/authenticationendpoint/samlsso_notification.do + 5 + 60000 + + false + http://wso2.org/claims + org.wso2.carbon.identity.sso.saml.builders.assertion.ExtendedDefaultAssertionBuilder + + org.wso2.carbon.identity.sso.saml.builders.encryption.DefaultSSOEncrypter + org.wso2.carbon.identity.sso.saml.builders.signature.DefaultSSOSigner + org.wso2.carbon.identity.sso.saml.validators.SAML2HTTPRedirectDeflateSignatureValidator + + + + 5 + false + http://www.w3.org/2000/09/xmldsig#rsa-sha1 + http://www.w3.org/2000/09/xmldsig#sha1 + true + + + + + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/services/wso2carbon-sts + + + + + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/passivests + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/authenticationendpoint/retry.do + org.wso2.carbon.identity.sts.passive.utils.NoPersistenceTokenStore + true + + + + + false + ${Ports.ThriftEntitlementReceivePort} + 10000 + + ${carbon.home}/repository/resources/security/wso2carbon.jks + wso2carbon + + + ${carbon.host} + + + + + + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/wso2/scim/Users + ${carbon.protocol}://${carbon.host}:${carbon.management.port}/wso2/scim/Groups + + + 5 + + + 10 + local://services + + + + + + + + + + + + + org.wso2.carbon.identity.governance.store.JDBCIdentityDataStore + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /permission/admin/manage/identity/identitymgt + + + + + + /permission/admin/manage/identity/usermgt/view + + + /permission/admin/manage/identity/usermgt/view + + + + /permission/admin/manage/identity/configmgt/list + + + + /permission/admin/manage/identity/configmgt/add + + + /permission/admin/manage/identity/configmgt/update + + + + /permission/admin/manage/identity/configmgt/delete + + + + /permission/admin/manage/identity/configmgt/add + + + /permission/admin/manage/identity/configmgt/update + + + + /permission/admin/manage/identity/configmgt/delete + + + + /permission/admin/manage/identity/configmgt/add + + + /permission/admin/manage/identity/configmgt/update + + + + /permission/admin/manage/identity/configmgt/delete + + + + + + + /permission/admin/manage/identity/consentmgt/add + + + + /permission/admin/manage/identity/consentmgt/delete + + + + /permission/admin/manage/identity/consentmgt/add + + + + /permission/admin/manage/identity/consentmgt/delete + + + + /permission/admin/manage/identity/consentmgt/add + + + + /permission/admin/manage/identity/consentmgt/delete + + + + /permission/admin/manage/identity/identitymgt + + + + /permission/admin/manage/identity/applicationmgt/create + + + /permission/admin/manage/identity/applicationmgt/delete + + + /permission/admin/manage/identity/applicationmgt/update + + + /permission/admin/manage/identity/applicationmgt/view + + + /permission/admin/manage/identity/applicationmgt/delete + + + /permission/admin/manage/identity/applicationmgt/create + + + /permission/admin/manage/identity/applicationmgt/view + + + /permission/admin/manage/identity/pep + + + /permission/admin/manage/identity/usermgt/create + + + /permission/admin/manage/identity/usermgt/list + + + /permission/admin/manage/identity/rolemgt/create + + + /permission/admin/manage/identity/rolemgt/view + + + /permission/admin/manage/identity/usermgt/view + + + /permission/admin/manage/identity/usermgt/update + + + /permission/admin/manage/identity/usermgt/update + + + /permission/admin/manage/identity/usermgt/delete + + + /permission/admin/manage/identity/rolemgt/view + + + /permission/admin/manage/identity/rolemgt/update + + + /permission/admin/manage/identity/rolemgt/update + + + /permission/admin/manage/identity/rolemgt/delete + + + /permission/admin/login + + + /permission/admin/manage/identity/usermgt/delete + + + /permission/admin/login + + + /permission/admin/login + + + /permission/admin/manage/identity/usermgt/create + + + + + + + + + /permission/admin/manage/identity/usermgt + + + /permission/admin/manage/identity/applicationmgt + + + + + + + /permission/admin/manage/identity/usermgt/update + + + + + + /permission/admin/manage/humantask/viewtasks + + + /permission/admin/login + + + /permission/admin/manage/identity/usermgt + + + /permission/admin/manage/identity/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /api/identity/user/v0.9 + /api/identity/recovery/v0.9 + /oauth2 + /api/identity/entitlement + + + /identity/(.*) + + + + + + applications,connections + + + + 300 + diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/testng.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/testng.xml new file mode 100644 index 000000000000..90613c3d2d42 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/testng.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/components/rule-mgt/pom.xml b/components/rule-mgt/pom.xml index 87033906ceca..d4172454e19a 100644 --- a/components/rule-mgt/pom.xml +++ b/components/rule-mgt/pom.xml @@ -37,5 +37,6 @@ org.wso2.carbon.identity.rule.metadata + org.wso2.carbon.identity.rule.management From f517b87e178e08c52147492f18c640a6cb011f65 Mon Sep 17 00:00:00 2001 From: malithie Date: Fri, 13 Dec 2024 01:14:02 +0530 Subject: [PATCH 02/20] Add table schemas. --- .../resources/dbscripts/db2.sql | 34 ++++++++++++++++++ .../resources/dbscripts/h2.sql | 23 ++++++++++++ .../resources/dbscripts/mssql.sql | 25 +++++++++++++ .../resources/dbscripts/mysql-cluster.sql | 23 ++++++++++++ .../resources/dbscripts/mysql.sql | 23 ++++++++++++ .../resources/dbscripts/oracle.sql | 35 +++++++++++++++++++ .../resources/dbscripts/oracle_rac.sql | 28 ++++++++++++++- .../resources/dbscripts/postgresql.sql | 22 ++++++++++++ 8 files changed, 212 insertions(+), 1 deletion(-) diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql index c8934674be58..cc632b9b31c9 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql @@ -2110,6 +2110,32 @@ REFERENCING NEW AS NEW FOR EACH ROW MODE DB2SQL = (NEXTVAL FOR IDN_OAUTH2_TOKEN_CLAIMS_SEQ); END / +CREATE TABLE IDN_RULE ( + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (UUID) +) +/ +CREATE TABLE IDN_RULE_REFERENCES ( + ID INTEGER NOT NULL, + RULE_UUID CHAR(36) NOT NULL, + FIELD_NAME VARCHAR(100) NOT NULL, + FIELD_REFERENCE VARCHAR(255) NOT NULL, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (ID), + FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE +) +/ +CREATE SEQUENCE IDN_RULE_REFERENCES_SEQ START WITH 1 INCREMENT BY 1 NOCACHE +/ +CREATE TRIGGER IDN_RULE_REFERENCES_TRIG NO CASCADE BEFORE INSERT ON IDN_RULE_REFERENCES +REFERENCING NEW AS NEW FOR EACH ROW MODE DB2SQL + BEGIN ATOMIC + SET (NEW.ID) = (NEXTVAL FOR IDN_RULE_REFERENCES_SEQ); + END +/ -- --------------------------- INDEX CREATION ----------------------------- -- IDN_OAUTH2_ACCESS_TOKEN -- @@ -2275,3 +2301,11 @@ CREATE INDEX IDX_IDN_CERTIFICATE_ID_TID ON IDN_CERTIFICATE (ID, TENANT_ID) / CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID) / + +-- RULES -- +CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID) +/ +CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID) +/ +CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID) +/ diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql index b8bed8110432..351721133953 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql @@ -1380,6 +1380,24 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_TOKEN_CLAIMS ( FOREIGN KEY (APP_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE ); +CREATE TABLE IF NOT EXISTS IDN_RULE ( + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (UUID) +); + +CREATE TABLE IF NOT EXISTS IDN_RULE_REFERENCES ( + ID INTEGER NOT NULL AUTO_INCREMENT, + RULE_UUID CHAR(36) NOT NULL, + FIELD_NAME VARCHAR(100) NOT NULL, + FIELD_REFERENCE VARCHAR(255) NOT NULL, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (ID), + FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE +); + -- --------------------------- INDEX CREATION ----------------------------- -- IDN_OAUTH2_ACCESS_TOKEN -- CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED); @@ -1492,3 +1510,8 @@ CREATE INDEX IDX_IDN_ACTION_ENDPOINT_AU_TI ON IDN_ACTION_ENDPOINT (ACTION_UUID, -- CERTIFICATE -- CREATE INDEX IDX_IDN_CERTIFICATE_ID_TID ON IDN_CERTIFICATE (ID, TENANT_ID); CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); + +-- RULES -- +CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql index ae2824ced0bc..54466698acd8 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql @@ -1530,6 +1530,26 @@ CREATE TABLE IDN_OAUTH2_TOKEN_CLAIMS ( FOREIGN KEY (APP_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE ); +IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_RULE]') AND TYPE IN (N'U')) +CREATE TABLE IDN_RULE ( + UUID CHAR(36) NOT NULL, + RULE VARBINARY(MAX) NOT NULL, + IS_ACTIVE BIT DEFAULT 1, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (UUID) +); + +IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_RULE_REFERENCES]') AND TYPE IN (N'U')) +CREATE TABLE IDN_RULE_REFERENCES ( + ID INTEGER IDENTITY, + RULE_UUID CHAR(36) NOT NULL, + FIELD_NAME VARCHAR(100) NOT NULL, + FIELD_REFERENCE VARCHAR(255) NOT NULL, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (ID), + FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE +); + -- --------------------------- INDEX CREATION ----------------------------- -- IDN_OAUTH2_ACCESS_TOKEN -- CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED); @@ -1644,6 +1664,11 @@ CREATE INDEX IDX_IDN_ACTION_ENDPOINT_AU_TI ON IDN_ACTION_ENDPOINT (ACTION_UUID, CREATE INDEX IDX_IDN_CERTIFICATE_ID_TID ON IDN_CERTIFICATE (ID, TENANT_ID); CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); +-- RULES -- +CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); + GO -- Trigger IDN_CLAIM delete by dialect on IDN_CLAIM_DIALECT deletion -- diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql index d9a4e310daab..9edd1f30d58c 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql @@ -1543,6 +1543,24 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_TOKEN_CLAIMS ( FOREIGN KEY (APP_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE )ENGINE NDB; +CREATE TABLE IF NOT EXISTS IDN_RULE ( + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (UUID) +)ENGINE NDB; + +CREATE TABLE IF NOT EXISTS IDN_RULE_REFERENCES ( + ID INTEGER AUTO_INCREMENT, + RULE_UUID CHAR(36) NOT NULL, + FIELD_NAME VARCHAR(100) NOT NULL, + FIELD_REFERENCE VARCHAR(255) NOT NULL, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (ID), + FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE +)ENGINE NDB; + -- --------------------------- INDEX CREATION ----------------------------- -- IDN_OAUTH2_ACCESS_TOKEN -- CREATE INDEX IDX_TC @@ -1684,3 +1702,8 @@ CREATE INDEX IDX_IDN_ACTION_ENDPOINT_AU_TI ON IDN_ACTION_ENDPOINT (ACTION_UUID, -- CERTIFICATE -- CREATE INDEX IDX_IDN_CERTIFICATE_ID_TID ON IDN_CERTIFICATE (ID, TENANT_ID); CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); + +-- RULES -- +CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql index 60bf37f8ca0f..42a60237a4ba 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql @@ -1411,6 +1411,24 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_TOKEN_CLAIMS ( FOREIGN KEY (APP_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE )DEFAULT CHARACTER SET latin1 ENGINE INNODB; +CREATE TABLE IF NOT EXISTS IDN_RULE ( + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (UUID) +)DEFAULT CHARACTER SET latin1 ENGINE INNODB; + +CREATE TABLE IF NOT EXISTS IDN_RULE_REFERENCES ( + ID INTEGER AUTO_INCREMENT, + RULE_UUID CHAR(36) NOT NULL, + FIELD_NAME VARCHAR(100) NOT NULL, + FIELD_REFERENCE VARCHAR(255) NOT NULL, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (ID), + FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE +)DEFAULT CHARACTER SET latin1 ENGINE INNODB; + -- --------------------------- INDEX CREATION ----------------------------- -- IDN_OAUTH2_ACCESS_TOKEN -- CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED); @@ -1520,3 +1538,8 @@ CREATE INDEX IDX_IDN_ACTION_ENDPOINT_AU_TI ON IDN_ACTION_ENDPOINT (ACTION_UUID, -- CERTIFICATE -- CREATE INDEX IDX_IDN_CERTIFICATE_ID_TID ON IDN_CERTIFICATE (ID, TENANT_ID); CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); + +-- RULES -- +CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql index b1daec5a8412..46026f065e97 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql @@ -2175,6 +2175,33 @@ CREATE OR REPLACE TRIGGER IDN_OAUTH2_TOKEN_CLAIMS_TRIG SELECT IDN_OAUTH2_TOKEN_CLAIMS_SEQ.nextval INTO :NEW.ID FROM dual; END; / +CREATE TABLE IDN_RULE ( + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE CHAR (1) DEFAULT '1', + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (UUID) +) +/ +CREATE TABLE IDN_RULE_REFERENCES ( + ID INTEGER, + RULE_UUID CHAR(36) NOT NULL, + FIELD_NAME VARCHAR(100) NOT NULL, + FIELD_REFERENCE VARCHAR(255) NOT NULL, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (ID), + FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE +) +/ +CREATE SEQUENCE IDN_RULE_REFERENCES_SEQ START WITH 1 INCREMENT BY 1 NOCACHE +/ +CREATE OR REPLACE TRIGGER IDN_RULE_REFERENCES_TRIGGER + BEFORE INSERT ON IDN_RULE_REFERENCES + REFERENCING NEW AS NEW FOR EACH ROW + BEGIN + SELECT IDN_RULE_REFERENCES_SEQ.nextval INTO :NEW.ID FROM dual; + END; +/ -- --------------------------- INDEX CREATION ----------------------------- -- IDN_OAUTH2_ACCESS_TOKEN -- @@ -2332,3 +2359,11 @@ CREATE INDEX IDX_IDN_CERTIFICATE_ID_TID ON IDN_CERTIFICATE (ID, TENANT_ID) / CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID) / + +-- RULES -- +CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID) +/ +CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID) +/ +CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID) +/ diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql index 430f4458488f..9817cba24ece 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql @@ -2108,7 +2108,33 @@ CREATE OR REPLACE TRIGGER IDN_OAUTH2_TOKEN_CLAIMS_TRIG SELECT IDN_OAUTH2_TOKEN_CLAIMS_SEQ.nextval INTO :NEW.ID FROM dual; END; / - +CREATE TABLE IDN_RULE ( + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE CHAR (1) DEFAULT '1', + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (UUID) +) +/ +CREATE TABLE IDN_RULE_REFERENCES ( + ID INTEGER, + RULE_UUID CHAR(36) NOT NULL, + FIELD_NAME VARCHAR(100) NOT NULL, + FIELD_REFERENCE VARCHAR(255) NOT NULL, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (ID), + FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE +) +/ +CREATE SEQUENCE IDN_RULE_REFERENCES_SEQ START WITH 1 INCREMENT BY 1 NOCACHE +/ +CREATE OR REPLACE TRIGGER IDN_RULE_REFERENCES_TRIGGER + BEFORE INSERT ON IDN_RULE_REFERENCES + REFERENCING NEW AS NEW FOR EACH ROW + BEGIN + SELECT IDN_RULE_REFERENCES_SEQ.nextval INTO :NEW.ID FROM dual; + END; +/ -- --------------------------- INDEX CREATION ----------------------------- -- IDN_OAUTH2_ACCESS_TOKEN -- CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED) diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql index cfd6cabf6105..27380b8d2f86 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql @@ -1652,6 +1652,28 @@ CREATE TABLE IDN_OAUTH2_TOKEN_CLAIMS ( FOREIGN KEY (APP_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE ); +DROP TABLE IF EXISTS IDN_RULE; +CREATE TABLE IDN_RULE ( + UUID CHAR(36) NOT NULL, + RULE BYTEA NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (UUID) +); + +DROP TABLE IF EXISTS IDN_RULE_REFERENCES; +DROP SEQUENCE IF EXISTS IDN_RULE_REFERENCES_SEQ; +CREATE SEQUENCE IDN_RULE_REFERENCES_SEQ; +CREATE TABLE IDN_RULE_REFERENCES ( + ID INTEGER NOT NULL DEFAULT NEXTVAL('IDN_RULE_REFERENCES_SEQ'), + RULE_UUID CHAR(36) NOT NULL, + FIELD_NAME VARCHAR(100) NOT NULL, + FIELD_REFERENCE VARCHAR(255) NOT NULL, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (ID), + FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE +); + -- --------------------------- INDEX CREATION ----------------------------- -- IDN_OAUTH2_ACCESS_TOKEN -- CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED); From 9112e8f9e0a5c4e9095a4035f202b7cd35bc89fc Mon Sep 17 00:00:00 2001 From: malithie Date: Fri, 13 Dec 2024 01:15:49 +0530 Subject: [PATCH 03/20] Add component to the feature. --- .../pom.xml | 7 +++++++ pom.xml | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml b/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml index a161015fcdce..f9a954eb5f48 100644 --- a/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml +++ b/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml @@ -37,6 +37,10 @@ org.wso2.carbon.identity.framework org.wso2.carbon.identity.rule.metadata + + org.wso2.carbon.identity.framework + org.wso2.carbon.identity.rule.management + @@ -64,6 +68,9 @@ org.wso2.carbon.identity.framework:org.wso2.carbon.identity.rule.metadata + + org.wso2.carbon.identity.framework:org.wso2.carbon.identity.rule.management + diff --git a/pom.xml b/pom.xml index 42bb2a2d45ef..0e46b89e2a92 100644 --- a/pom.xml +++ b/pom.xml @@ -335,6 +335,11 @@ org.wso2.carbon.identity.rule.metadata ${project.version} + + org.wso2.carbon.identity.framework + org.wso2.carbon.identity.rule.management + ${project.version} + org.wso2.carbon.identity.framework From 66226c6ed57526e33f2720a994ead9eb8d7fc435 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 12 Dec 2024 16:58:57 +0000 Subject: [PATCH 04/20] [WSO2 Release] [Jenkins #8140] [Release 7.7.34] prepare release v7.7.34 --- .../org.wso2.carbon.identity.action.execution/pom.xml | 2 +- .../org.wso2.carbon.identity.action.management/pom.xml | 2 +- components/action-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.api.resource.mgt/pom.xml | 2 +- components/api-resource-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.application.common/pom.xml | 2 +- .../org.wso2.carbon.identity.application.mgt.ui/pom.xml | 2 +- .../org.wso2.carbon.identity.application.mgt/pom.xml | 2 +- components/application-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/authentication-framework/pom.xml | 2 +- components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml | 2 +- components/captcha-mgt/pom.xml | 2 +- components/carbon-authenticators/pom.xml | 2 +- .../org.wso2.carbon.identity.authenticator.thrift/pom.xml | 2 +- components/carbon-authenticators/thrift-authenticator/pom.xml | 2 +- .../org.wso2.carbon.identity.central.log.mgt/pom.xml | 2 +- components/central-logger/pom.xml | 2 +- .../org.wso2.carbon.identity.certificate.management/pom.xml | 2 +- components/certificate-mgt/pom.xml | 2 +- components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml | 2 +- components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml | 2 +- .../org.wso2.carbon.identity.claim.metadata.mgt/pom.xml | 2 +- components/claim-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.client.attestation.mgt/pom.xml | 2 +- components/client-attestation-mgt/pom.xml | 2 +- .../pom.xml | 4 ++-- .../org.wso2.carbon.identity.configuration.mgt.core/pom.xml | 2 +- .../pom.xml | 2 +- components/configuration-mgt/pom.xml | 2 +- .../consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml | 2 +- components/consent-mgt/pom.xml | 2 +- .../pom.xml | 2 +- components/consent-server-configs-mgt/pom.xml | 2 +- .../cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml | 2 +- components/cors-mgt/pom.xml | 2 +- .../org.wso2.carbon.directory.server.manager.common/pom.xml | 2 +- .../org.wso2.carbon.directory.server.manager.ui/pom.xml | 2 +- .../org.wso2.carbon.directory.server.manager/pom.xml | 2 +- components/directory-server-manager/pom.xml | 2 +- .../org.wso2.carbon.identity.extension.mgt/pom.xml | 2 +- components/extension-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml | 2 +- .../org.wso2.carbon.identity.functions.library.mgt/pom.xml | 2 +- components/functions-library-mgt/pom.xml | 2 +- .../identity-core/org.wso2.carbon.identity.base/pom.xml | 2 +- .../identity-core/org.wso2.carbon.identity.core.ui/pom.xml | 2 +- .../identity-core/org.wso2.carbon.identity.core/pom.xml | 2 +- components/identity-core/pom.xml | 2 +- .../identity-event/org.wso2.carbon.identity.event/pom.xml | 2 +- components/identity-event/pom.xml | 2 +- .../org.wso2.carbon.identity.mgt.endpoint.util/pom.xml | 2 +- .../identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml | 2 +- components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml | 2 +- components/identity-mgt/pom.xml | 2 +- components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml | 2 +- components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml | 2 +- components/idp-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.input.validation.mgt/pom.xml | 2 +- components/input-validation-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.unique.claim.mgt/pom.xml | 2 +- components/multi-attribute-login/pom.xml | 2 +- .../org.wso2.carbon.identity.notification.mgt/pom.xml | 2 +- components/notification-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.provisioning/pom.xml | 2 +- components/provisioning/pom.xml | 2 +- .../role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml | 2 +- .../org.wso2.carbon.identity.role.v2.mgt.core/pom.xml | 2 +- components/role-mgt/pom.xml | 2 +- .../rule-mgt/org.wso2.carbon.identity.rule.metadata/pom.xml | 2 +- components/rule-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.secret.mgt.core/pom.xml | 2 +- components/secret-mgt/pom.xml | 2 +- .../security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml | 2 +- components/security-mgt/org.wso2.carbon.security.mgt/pom.xml | 2 +- components/security-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.template.mgt.ui/pom.xml | 2 +- .../org.wso2.carbon.identity.template.mgt/pom.xml | 2 +- components/template-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.trusted.app.mgt/pom.xml | 2 +- components/trusted-app-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.user.functionality.mgt/pom.xml | 2 +- components/user-functionality-mgt/pom.xml | 2 +- .../user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml | 2 +- .../user-mgt/org.wso2.carbon.identity.user.profile/pom.xml | 2 +- .../org.wso2.carbon.identity.user.registration/pom.xml | 2 +- components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml | 2 +- components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml | 2 +- components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml | 2 +- components/user-mgt/org.wso2.carbon.user.mgt/pom.xml | 2 +- components/user-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.user.store.configuration/pom.xml | 2 +- .../org.wso2.carbon.identity.user.store.count/pom.xml | 2 +- components/user-store/pom.xml | 2 +- .../pom.xml | 2 +- features/action-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/api-resource-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.application.mgt.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/application-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/authentication-framework/pom.xml | 2 +- features/carbon-authenticators/pom.xml | 2 +- .../pom.xml | 2 +- features/carbon-authenticators/thrift-authenticator/pom.xml | 2 +- features/categories/authorization/pom.xml | 2 +- features/categories/inbound-authentication/pom.xml | 2 +- features/categories/inbound-provisioning/pom.xml | 2 +- features/categories/keystore-mgt/pom.xml | 2 +- features/categories/notification-mgt/pom.xml | 2 +- features/categories/outbound-authentication/pom.xml | 2 +- features/categories/outbound-provisioning/pom.xml | 2 +- features/categories/pom.xml | 2 +- features/categories/user-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/central-logger/pom.xml | 2 +- .../pom.xml | 2 +- features/certificate-mgt/pom.xml | 2 +- features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml | 2 +- .../org.wso2.carbon.claim.mgt.server.feature/pom.xml | 2 +- .../claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml | 2 +- features/claim-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/client-attestation-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/configuration-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/consent-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/consent-server-configs-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml | 2 +- features/cors-mgt/pom.xml | 2 +- .../org.wso2.carbon.directory.service.mgr.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml | 2 +- features/directory-server-manager/pom.xml | 2 +- .../org.wso2.carbon.identity.extension.mgt.feature/pom.xml | 2 +- features/extension-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/functions-library-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.core.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.core.server.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.core.ui.feature/pom.xml | 2 +- features/identity-core/pom.xml | 2 +- .../org.wso2.carbon.identity.event.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.event.server.feature/pom.xml | 2 +- features/identity-event/pom.xml | 2 +- .../identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.mgt.server.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.mgt.ui.feature/pom.xml | 2 +- features/identity-mgt/pom.xml | 2 +- features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml | 2 +- .../idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml | 2 +- features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml | 2 +- features/idp-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/input-validation-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/multi-attribute-login/pom.xml | 2 +- .../org.wso2.carbon.identity.notification.mgt.feature/pom.xml | 2 +- .../pom.xml | 2 +- features/notification-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/provisioning/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/role-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/rule-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/secret-mgt/pom.xml | 2 +- .../security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml | 2 +- .../org.wso2.carbon.security.mgt.server.feature/pom.xml | 2 +- .../org.wso2.carbon.security.mgt.ui.feature/pom.xml | 2 +- features/security-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.template.mgt.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml | 2 +- features/template-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/trusted-app-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/user-functionality-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.user.profile.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.user.profile.ui.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml | 2 +- features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml | 2 +- .../user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml | 2 +- features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml | 2 +- features/user-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/user-store/pom.xml | 2 +- pom.xml | 4 ++-- service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.directory.server.manager.stub/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.application.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml | 2 +- .../pom.xml | 2 +- .../identity/org.wso2.carbon.identity.governance.stub/pom.xml | 2 +- .../identity/org.wso2.carbon.identity.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.user.profile.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.user.registration.stub/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.user.store.count.stub/pom.xml | 2 +- service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml | 2 +- .../identity/org.wso2.carbon.security.mgt.stub/pom.xml | 2 +- service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml | 2 +- service-stubs/identity/pom.xml | 2 +- test-utils/org.wso2.carbon.identity.testutil/pom.xml | 2 +- 227 files changed, 229 insertions(+), 229 deletions(-) diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml b/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml index 90c103851275..a02d4d04c530 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework action-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml b/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml index 507240ad792a..5a102054333b 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml +++ b/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework action-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/action-mgt/pom.xml b/components/action-mgt/pom.xml index 8fc3e9963803..d854edce4411 100644 --- a/components/action-mgt/pom.xml +++ b/components/action-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml index 51aa61b9940d..6b56c7676577 100644 --- a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml +++ b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework api-resource-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml index ab945e557b91..4e4718cde9c0 100644 --- a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml +++ b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework api-resource-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml org.wso2.carbon.identity.api.resource.mgt diff --git a/components/api-resource-mgt/pom.xml b/components/api-resource-mgt/pom.xml index 99c291f0e57a..38d84f49fefb 100644 --- a/components/api-resource-mgt/pom.xml +++ b/components/api-resource-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml index ea69597305b6..0c5cf44cf0f4 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml +++ b/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.framework application-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml index 9c2f3706dd03..f0c005e782f0 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework application-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml index 88269e3eed70..cb59aa863ac6 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml org.wso2.carbon.identity.application.mgt diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml index 527455e45ee8..83de73657363 100644 --- a/components/application-mgt/pom.xml +++ b/components/application-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml index d5403a22b252..fc4256468984 100644 --- a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml +++ b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework authentication-framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml index df6095a9e6ee..b2e1b62daf4f 100644 --- a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml +++ b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework authentication-framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/authentication-framework/pom.xml b/components/authentication-framework/pom.xml index a6f3e734fc42..c3ae9162f806 100644 --- a/components/authentication-framework/pom.xml +++ b/components/authentication-framework/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml b/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml index cde92738165b..feee2f557943 100644 --- a/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml +++ b/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework captcha-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/captcha-mgt/pom.xml b/components/captcha-mgt/pom.xml index db7b8a0a6f56..dfcf24904792 100644 --- a/components/captcha-mgt/pom.xml +++ b/components/captcha-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/carbon-authenticators/pom.xml b/components/carbon-authenticators/pom.xml index 685bb247c690..e3b499218d7e 100644 --- a/components/carbon-authenticators/pom.xml +++ b/components/carbon-authenticators/pom.xml @@ -17,7 +17,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml b/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml index bb4225899e3f..ec4e19f11486 100644 --- a/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml +++ b/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework thrift-authenticator - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/carbon-authenticators/thrift-authenticator/pom.xml b/components/carbon-authenticators/thrift-authenticator/pom.xml index 3c590af7dbf3..db7da8e1d72f 100644 --- a/components/carbon-authenticators/thrift-authenticator/pom.xml +++ b/components/carbon-authenticators/thrift-authenticator/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework carbon-authenticators - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml b/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml index d197b4f4cadb..1efe4c4d932b 100644 --- a/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml +++ b/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml @@ -21,7 +21,7 @@ central-logger org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/components/central-logger/pom.xml b/components/central-logger/pom.xml index e0d2f6ece060..f2066a8f4690 100644 --- a/components/central-logger/pom.xml +++ b/components/central-logger/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml b/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml index ddf994174894..afb2ba214e0b 100644 --- a/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework certificate-mgt - 7.7.34-SNAPSHOT + 7.7.34 4.0.0 diff --git a/components/certificate-mgt/pom.xml b/components/certificate-mgt/pom.xml index 3b9b4da31f20..d0663bf6ad48 100644 --- a/components/certificate-mgt/pom.xml +++ b/components/certificate-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml b/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml index 82714a15e958..4e4b760c0440 100644 --- a/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml b/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml index 5001edbfe3ef..36ace2f971da 100644 --- a/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml index 0b5eb4e7b083..ff50ad6a2280 100644 --- a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml index 13be46729bf7..004ac887ed92 100644 --- a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/claim-mgt/pom.xml b/components/claim-mgt/pom.xml index 9f44c0bfc57f..ea34b67999a7 100644 --- a/components/claim-mgt/pom.xml +++ b/components/claim-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml b/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml index b22ea08db108..2db235dc74b6 100644 --- a/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml +++ b/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework client-attestation-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/client-attestation-mgt/pom.xml b/components/client-attestation-mgt/pom.xml index c5970b3639b2..176b092cea8d 100644 --- a/components/client-attestation-mgt/pom.xml +++ b/components/client-attestation-mgt/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml index 354b5115e4b6..b6c7c932d7b8 100644 --- a/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml +++ b/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml @@ -23,11 +23,11 @@ org.wso2.carbon.identity.framework configuration-mgt - 7.7.34-SNAPSHOT + 7.7.34 org.wso2.carbon.identity.api.server.configuration.mgt - 7.7.34-SNAPSHOT + 7.7.34 jar WSO2 Carbon - Configuration Management API Identity Configuration Management API diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml index f53797dcf2ba..c80fe438a5dc 100644 --- a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml +++ b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework configuration-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml index 19eb19eb698b..848a3d20298d 100644 --- a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml +++ b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework configuration-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/configuration-mgt/pom.xml b/components/configuration-mgt/pom.xml index cb9a2a0feec7..3866784a01bd 100644 --- a/components/configuration-mgt/pom.xml +++ b/components/configuration-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml b/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml index 739c40e71407..de83ec90e95c 100644 --- a/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml +++ b/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework consent-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/consent-mgt/pom.xml b/components/consent-mgt/pom.xml index 31bd1a7394ad..f2d3df5aa5bb 100644 --- a/components/consent-mgt/pom.xml +++ b/components/consent-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml b/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml index ac18c19aa0bb..c70c936277c2 100644 --- a/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml +++ b/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework consent-server-configs-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/consent-server-configs-mgt/pom.xml b/components/consent-server-configs-mgt/pom.xml index 0cce2583a354..cb263f367fd1 100644 --- a/components/consent-server-configs-mgt/pom.xml +++ b/components/consent-server-configs-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml b/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml index f8caf0178d52..6325d5ede27f 100644 --- a/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml +++ b/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework cors-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/cors-mgt/pom.xml b/components/cors-mgt/pom.xml index 85d5d73ace38..cabf6f0b9ff3 100644 --- a/components/cors-mgt/pom.xml +++ b/components/cors-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml index 302265543184..9d42c7c598e4 100644 --- a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml +++ b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework directory-server-manager - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml index c38c5d9fb9b5..4b95f197d5c0 100644 --- a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml +++ b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml b/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml index 1544d96f1cf7..f1846dfd4b31 100644 --- a/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml +++ b/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/directory-server-manager/pom.xml b/components/directory-server-manager/pom.xml index 28ded9d74c80..04b2c85cea50 100644 --- a/components/directory-server-manager/pom.xml +++ b/components/directory-server-manager/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml b/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml index 6c17e3846c66..36f7b72b1458 100644 --- a/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml +++ b/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework extension-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/extension-mgt/pom.xml b/components/extension-mgt/pom.xml index a7627a404d4e..2e94dd0a3728 100644 --- a/components/extension-mgt/pom.xml +++ b/components/extension-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml index f7c265df3973..4f5d6ad51470 100644 --- a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml +++ b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml @@ -21,7 +21,7 @@ functions-library-mgt org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml index 88bbdbb3e9b1..7034f0a1c356 100644 --- a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml +++ b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml @@ -21,7 +21,7 @@ functions-library-mgt org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/components/functions-library-mgt/pom.xml b/components/functions-library-mgt/pom.xml index 3ac062bf475b..e3f5e9567aff 100644 --- a/components/functions-library-mgt/pom.xml +++ b/components/functions-library-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/identity-core/org.wso2.carbon.identity.base/pom.xml b/components/identity-core/org.wso2.carbon.identity.base/pom.xml index 1bfc3246a2ba..24934806abab 100644 --- a/components/identity-core/org.wso2.carbon.identity.base/pom.xml +++ b/components/identity-core/org.wso2.carbon.identity.base/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-core - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml b/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml index 23ddeeb46d68..f3cd0b6ed466 100644 --- a/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml +++ b/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/identity-core/org.wso2.carbon.identity.core/pom.xml b/components/identity-core/org.wso2.carbon.identity.core/pom.xml index d8ec61cef78d..bcdcfc524643 100644 --- a/components/identity-core/org.wso2.carbon.identity.core/pom.xml +++ b/components/identity-core/org.wso2.carbon.identity.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-core - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/identity-core/pom.xml b/components/identity-core/pom.xml index 642310bdbb40..0bedcda1de53 100644 --- a/components/identity-core/pom.xml +++ b/components/identity-core/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/identity-event/org.wso2.carbon.identity.event/pom.xml b/components/identity-event/org.wso2.carbon.identity.event/pom.xml index 2cf40c1d87c7..e58c487ab0a4 100644 --- a/components/identity-event/org.wso2.carbon.identity.event/pom.xml +++ b/components/identity-event/org.wso2.carbon.identity.event/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-event - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/identity-event/pom.xml b/components/identity-event/pom.xml index af28c4d83b3f..b60a41514ccc 100644 --- a/components/identity-event/pom.xml +++ b/components/identity-event/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml b/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml index f69e13e299da..29d97426bcf6 100644 --- a/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml +++ b/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml b/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml index b674405ba767..ed3e7748fb68 100644 --- a/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml +++ b/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework identity-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml b/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml index 592a8ba8b9c0..10c82d740e2a 100644 --- a/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml +++ b/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/identity-mgt/pom.xml b/components/identity-mgt/pom.xml index 60b1abc6303b..c4df894728b6 100644 --- a/components/identity-mgt/pom.xml +++ b/components/identity-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml b/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml index 72254d0e376c..adcb1719eef1 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml b/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml index ebf9962da96d..12d0d2a7608d 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-provider-management - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/idp-mgt/pom.xml b/components/idp-mgt/pom.xml index 0d64b4ffde89..7fc420e59dfe 100644 --- a/components/idp-mgt/pom.xml +++ b/components/idp-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml b/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml index 7a6e42472714..f888a543c4bc 100644 --- a/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml +++ b/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework input-validation-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/input-validation-mgt/pom.xml b/components/input-validation-mgt/pom.xml index 355a8156aa59..370edd587091 100644 --- a/components/input-validation-mgt/pom.xml +++ b/components/input-validation-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml b/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml index 0b15eddfe97c..092c01fd4735 100644 --- a/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml +++ b/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml @@ -21,7 +21,7 @@ multi-attribute-login org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml b/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml index 6faa35c9cc3b..42baeaf8c5e2 100644 --- a/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml +++ b/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml @@ -21,7 +21,7 @@ multi-attribute-login org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/components/multi-attribute-login/pom.xml b/components/multi-attribute-login/pom.xml index 8dc12fb5a335..dda275cff47f 100644 --- a/components/multi-attribute-login/pom.xml +++ b/components/multi-attribute-login/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml 4.0.0 diff --git a/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml b/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml index ce31d60976d2..71e206f76ae0 100644 --- a/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml +++ b/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework notification-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/notification-mgt/pom.xml b/components/notification-mgt/pom.xml index b798d270ffc2..504aada07d3c 100644 --- a/components/notification-mgt/pom.xml +++ b/components/notification-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml b/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml index 4bef4dd6cac1..822874194930 100644 --- a/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml +++ b/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework provisioning - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/provisioning/pom.xml b/components/provisioning/pom.xml index 1a82185d55df..0936e6b8fca0 100644 --- a/components/provisioning/pom.xml +++ b/components/provisioning/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml b/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml index 79d6d48ee33c..882d04c556b4 100644 --- a/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml +++ b/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework role-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml b/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml index ceb23ffb006d..860bd1b632c6 100644 --- a/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml +++ b/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework role-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/role-mgt/pom.xml b/components/role-mgt/pom.xml index 30358453f4bb..78ea2cb90217 100644 --- a/components/role-mgt/pom.xml +++ b/components/role-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.metadata/pom.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.metadata/pom.xml index 3475f6178a13..bf692e4ce5a5 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.metadata/pom.xml +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.metadata/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework rule-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/rule-mgt/pom.xml b/components/rule-mgt/pom.xml index d4172454e19a..22985acdf14f 100644 --- a/components/rule-mgt/pom.xml +++ b/components/rule-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml b/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml index de2409e87c26..f454f13ad1d9 100644 --- a/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml +++ b/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework secret-mgt - 7.7.34-SNAPSHOT + 7.7.34 4.0.0 diff --git a/components/secret-mgt/pom.xml b/components/secret-mgt/pom.xml index 8e736d2cab93..803a14ae18a9 100644 --- a/components/secret-mgt/pom.xml +++ b/components/secret-mgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml b/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml index 3c82a0621f1f..1eea58c1470e 100644 --- a/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml +++ b/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml b/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml index 6997642e124f..877ef14cfe87 100644 --- a/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml +++ b/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/security-mgt/pom.xml b/components/security-mgt/pom.xml index 7f86a35d90c7..529613c8f59b 100644 --- a/components/security-mgt/pom.xml +++ b/components/security-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml b/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml index 22a0053adac2..e76d39489a4a 100644 --- a/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml +++ b/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework template-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml b/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml index c60791a3c2e2..c118a2dd0437 100644 --- a/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml +++ b/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework template-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/components/template-mgt/pom.xml b/components/template-mgt/pom.xml index 5952c4feee4c..ab8668ac6aa8 100644 --- a/components/template-mgt/pom.xml +++ b/components/template-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml b/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml index 2e0f55b76a38..6f987a27c7f2 100644 --- a/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml +++ b/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework trusted-app-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/trusted-app-mgt/pom.xml b/components/trusted-app-mgt/pom.xml index 782fc85684a7..ef4865bfce32 100644 --- a/components/trusted-app-mgt/pom.xml +++ b/components/trusted-app-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml b/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml index 406ba731d696..aa5e30ce641d 100644 --- a/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml +++ b/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml @@ -21,7 +21,7 @@ user-functionality-mgt org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 4.0.0 diff --git a/components/user-functionality-mgt/pom.xml b/components/user-functionality-mgt/pom.xml index 7a48a8ef8964..ed8e37e880bf 100644 --- a/components/user-functionality-mgt/pom.xml +++ b/components/user-functionality-mgt/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml index f164152b6b13..9f5ce9b2a30d 100644 --- a/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml +++ b/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml index 9380d567b601..4e5d313d1deb 100644 --- a/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml +++ b/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml index 84f227fd0f55..a1aae59b29b8 100644 --- a/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml +++ b/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml b/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml index 18a15ba1aff2..88f99d9667f1 100644 --- a/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml +++ b/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml b/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml index e64ba3f0342d..6ec86bc63b0b 100644 --- a/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml +++ b/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml b/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml index 57944cd5ff49..6d265a0e5df1 100644 --- a/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml +++ b/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml b/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml index 4d99ab04b3f1..22342e194508 100644 --- a/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml +++ b/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-mgt/pom.xml b/components/user-mgt/pom.xml index 842b14fc7146..358274937e3f 100644 --- a/components/user-mgt/pom.xml +++ b/components/user-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml index 51e0814b055e..8ce9ad13e53b 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml index a226439c9a51..20950aefddd0 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml index 4eb56c1b9a70..e7701330b6b9 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml index 51b7213ade2d..bf7d410242e3 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/components/user-store/pom.xml b/components/user-store/pom.xml index f973e5d91716..501e8933081b 100644 --- a/components/user-store/pom.xml +++ b/components/user-store/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml b/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml index 0ce51d6c14a1..e49c1a294924 100644 --- a/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml +++ b/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework action-management-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/action-mgt/pom.xml b/features/action-mgt/pom.xml index 211d7dd8973a..334d9583091f 100644 --- a/features/action-mgt/pom.xml +++ b/features/action-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml index 2d12c5b4afed..b4adb1ef5f47 100644 --- a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml +++ b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework api-resource-management-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/api-resource-mgt/pom.xml b/features/api-resource-mgt/pom.xml index f0c584217933..a7a2b4132c34 100644 --- a/features/api-resource-mgt/pom.xml +++ b/features/api-resource-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml b/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml index aa5bf1fcdcdc..f32a80c4f9fb 100644 --- a/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml b/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml index 68dcc47eae62..520e5dbc51f0 100644 --- a/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml b/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml index c1f567aa7ac8..c3fb47d8bd2d 100644 --- a/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml index dc3f214e0559..eeef1e19bfa7 100644 --- a/features/application-mgt/pom.xml +++ b/features/application-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml b/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml index 1087bb183b09..9abb602c35bd 100644 --- a/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml +++ b/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework authentication-framework-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/authentication-framework/pom.xml b/features/authentication-framework/pom.xml index 6c627c21ab64..3a07b3f07dd4 100644 --- a/features/authentication-framework/pom.xml +++ b/features/authentication-framework/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/carbon-authenticators/pom.xml b/features/carbon-authenticators/pom.xml index 2c05bbe58dcd..2b68d4df564f 100644 --- a/features/carbon-authenticators/pom.xml +++ b/features/carbon-authenticators/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml b/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml index 3fe6766b6acb..9f1e1a349c6b 100644 --- a/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml +++ b/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework thrift-authenticator-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/carbon-authenticators/thrift-authenticator/pom.xml b/features/carbon-authenticators/thrift-authenticator/pom.xml index 40fb4dceda33..919151a6aecc 100644 --- a/features/carbon-authenticators/thrift-authenticator/pom.xml +++ b/features/carbon-authenticators/thrift-authenticator/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-authenticator-features - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/categories/authorization/pom.xml b/features/categories/authorization/pom.xml index 95d440ecc082..93efec4e7380 100644 --- a/features/categories/authorization/pom.xml +++ b/features/categories/authorization/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../../pom.xml diff --git a/features/categories/inbound-authentication/pom.xml b/features/categories/inbound-authentication/pom.xml index 9dc2cc680071..5a9a2fbd1177 100644 --- a/features/categories/inbound-authentication/pom.xml +++ b/features/categories/inbound-authentication/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../../pom.xml diff --git a/features/categories/inbound-provisioning/pom.xml b/features/categories/inbound-provisioning/pom.xml index 7f987052f388..0fcd2134a474 100644 --- a/features/categories/inbound-provisioning/pom.xml +++ b/features/categories/inbound-provisioning/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../../pom.xml diff --git a/features/categories/keystore-mgt/pom.xml b/features/categories/keystore-mgt/pom.xml index 1eeb19c9197d..b39c66728db2 100644 --- a/features/categories/keystore-mgt/pom.xml +++ b/features/categories/keystore-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../../pom.xml diff --git a/features/categories/notification-mgt/pom.xml b/features/categories/notification-mgt/pom.xml index 7e2be64b9561..31dc051663f1 100644 --- a/features/categories/notification-mgt/pom.xml +++ b/features/categories/notification-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../../pom.xml diff --git a/features/categories/outbound-authentication/pom.xml b/features/categories/outbound-authentication/pom.xml index 28cbba3c9504..8cffc792f073 100644 --- a/features/categories/outbound-authentication/pom.xml +++ b/features/categories/outbound-authentication/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../../pom.xml diff --git a/features/categories/outbound-provisioning/pom.xml b/features/categories/outbound-provisioning/pom.xml index b258a5e12d73..d117dc1a45b5 100644 --- a/features/categories/outbound-provisioning/pom.xml +++ b/features/categories/outbound-provisioning/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../../pom.xml diff --git a/features/categories/pom.xml b/features/categories/pom.xml index b82846525924..16590af65334 100644 --- a/features/categories/pom.xml +++ b/features/categories/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/categories/user-mgt/pom.xml b/features/categories/user-mgt/pom.xml index 4c5be086d3a4..ac5410b5694f 100644 --- a/features/categories/user-mgt/pom.xml +++ b/features/categories/user-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../../pom.xml diff --git a/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml b/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml index d0974fce8159..7bd6de43ee5c 100644 --- a/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml +++ b/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework central-logger-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/central-logger/pom.xml b/features/central-logger/pom.xml index 5ae37665e728..c658f60f5e01 100644 --- a/features/central-logger/pom.xml +++ b/features/central-logger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml 4.0.0 diff --git a/features/certificate-mgt/org.wso2.carbon.identity.certificate.management.server.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.identity.certificate.management.server.feature/pom.xml index 1d569096724c..4b6abed63848 100644 --- a/features/certificate-mgt/org.wso2.carbon.identity.certificate.management.server.feature/pom.xml +++ b/features/certificate-mgt/org.wso2.carbon.identity.certificate.management.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework certificate-management-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/certificate-mgt/pom.xml b/features/certificate-mgt/pom.xml index adeeafa20207..108d1e26cef0 100644 --- a/features/certificate-mgt/pom.xml +++ b/features/certificate-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml index 51bf2dd9347e..9ad40a4876ca 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml index 958757253788..316cebfddd2b 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml index e7fa5f7dd550..66934b60c6bf 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/claim-mgt/pom.xml b/features/claim-mgt/pom.xml index 0fd35353b795..64c14a66653e 100644 --- a/features/claim-mgt/pom.xml +++ b/features/claim-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml b/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml index 2408c2486e34..9b909f6e0179 100644 --- a/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml +++ b/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework client-attestation-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/client-attestation-mgt/pom.xml b/features/client-attestation-mgt/pom.xml index 19ba10f0fed3..5e36828f41bb 100644 --- a/features/client-attestation-mgt/pom.xml +++ b/features/client-attestation-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml 4.0.0 diff --git a/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml b/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml index 10bbdf343976..5e5c6fc61f3f 100644 --- a/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml +++ b/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework configuration-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/configuration-mgt/pom.xml b/features/configuration-mgt/pom.xml index 23a22f1083eb..33e6b23cbd34 100644 --- a/features/configuration-mgt/pom.xml +++ b/features/configuration-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml b/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml index 34e34e142602..88b7017d5395 100644 --- a/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml +++ b/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-consent-mgt-aggregator - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/consent-mgt/pom.xml b/features/consent-mgt/pom.xml index 1b70aca3d333..38c0c7ac5726 100644 --- a/features/consent-mgt/pom.xml +++ b/features/consent-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml b/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml index d2463c159af8..f55ab6e0b646 100644 --- a/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml +++ b/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework consent-server-configs-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/consent-server-configs-mgt/pom.xml b/features/consent-server-configs-mgt/pom.xml index 3cf11b285029..0e9dafb4b6f7 100644 --- a/features/consent-server-configs-mgt/pom.xml +++ b/features/consent-server-configs-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml 4.0.0 diff --git a/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml b/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml index a4344bcfed35..2137e1999ed6 100644 --- a/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml +++ b/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework cors-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/cors-mgt/pom.xml b/features/cors-mgt/pom.xml index 0420d27eaa73..d803c08f086b 100644 --- a/features/cors-mgt/pom.xml +++ b/features/cors-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml index dfdb1700b87b..249d6ea8ff9b 100644 --- a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml +++ b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml index 883593f4b114..6f43117a7968 100644 --- a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml +++ b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml index 684cdf6aac99..8f090ddd1383 100644 --- a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml +++ b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/directory-server-manager/pom.xml b/features/directory-server-manager/pom.xml index ba4aa91c5abf..f2125aa20a22 100644 --- a/features/directory-server-manager/pom.xml +++ b/features/directory-server-manager/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml index 37bb79b5a665..0045ee8ca62b 100644 --- a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml +++ b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml @@ -19,7 +19,7 @@ extension-management-feature org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 org.wso2.carbon.identity.extension.mgt.feature diff --git a/features/extension-mgt/pom.xml b/features/extension-mgt/pom.xml index 854356550401..23ceb76705aa 100644 --- a/features/extension-mgt/pom.xml +++ b/features/extension-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml index ca463d44df1f..af8dc5eaad6f 100644 --- a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml +++ b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework functions-library-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml index 1edb1893ccc1..6542084bc253 100644 --- a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml +++ b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework functions-library-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml index beec131150ea..6f6b3b512167 100644 --- a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml +++ b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework functions-library-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/features/functions-library-mgt/pom.xml b/features/functions-library-mgt/pom.xml index ccf6afae11b5..10d58e3fb85b 100644 --- a/features/functions-library-mgt/pom.xml +++ b/features/functions-library-mgt/pom.xml @@ -28,7 +28,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml b/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml index e7c2771fd1b4..d8a9150dc752 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml +++ b/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml b/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml index b92037ccbc0d..fc887920e66c 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml b/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml index 01927cf4a94d..7b3478829ed9 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml +++ b/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/identity-core/pom.xml b/features/identity-core/pom.xml index 73dee2b00239..17c9a2b86719 100644 --- a/features/identity-core/pom.xml +++ b/features/identity-core/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml b/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml index 1e35537aeb28..a81d3cdec2ba 100644 --- a/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml +++ b/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-event-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml b/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml index 0fe0589f071a..f282573c52b2 100644 --- a/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml +++ b/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-event-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/identity-event/pom.xml b/features/identity-event/pom.xml index 8c9cc57a7ffa..45533f17969d 100644 --- a/features/identity-event/pom.xml +++ b/features/identity-event/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml b/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml index b8212cc0b473..14167c266e54 100644 --- a/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml +++ b/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml b/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml index 7754110ced0a..7046917a7cde 100644 --- a/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml +++ b/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml b/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml index ff61624674c5..d29c7a623836 100644 --- a/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml +++ b/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/identity-mgt/pom.xml b/features/identity-mgt/pom.xml index af8911f0168e..febcf2088973 100644 --- a/features/identity-mgt/pom.xml +++ b/features/identity-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml b/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml index 6692a939eacd..20a409f2beee 100644 --- a/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml +++ b/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml b/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml index 20562cb00d16..e2afc547ce2e 100644 --- a/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml +++ b/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml b/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml index 71e438ee618e..efb1b594b239 100644 --- a/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml +++ b/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/idp-mgt/pom.xml b/features/idp-mgt/pom.xml index adf9cef3298d..8a33056ee8c6 100644 --- a/features/idp-mgt/pom.xml +++ b/features/idp-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml b/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml index b316209b5465..4437777f2888 100644 --- a/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml +++ b/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework input-validation-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/input-validation-mgt/pom.xml b/features/input-validation-mgt/pom.xml index ad2623773dcc..ebe13eef1ff6 100644 --- a/features/input-validation-mgt/pom.xml +++ b/features/input-validation-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml 4.0.0 diff --git a/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml b/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml index 8763f5c6f07f..45be2065d7c3 100644 --- a/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml +++ b/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ multi-attribute-login-feature org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml b/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml index 729e0adfbc48..9c1db27b2596 100644 --- a/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml +++ b/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ multi-attribute-login-feature org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/features/multi-attribute-login/pom.xml b/features/multi-attribute-login/pom.xml index 0c101898caa0..cfe5e88681f7 100644 --- a/features/multi-attribute-login/pom.xml +++ b/features/multi-attribute-login/pom.xml @@ -20,7 +20,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml index d59adce271b5..51250c717651 100644 --- a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml +++ b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-notification-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml index 1a4de9582b34..21fd138f3e89 100644 --- a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml +++ b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-notification-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/notification-mgt/pom.xml b/features/notification-mgt/pom.xml index 09a66e8c301c..e4e668b6d154 100644 --- a/features/notification-mgt/pom.xml +++ b/features/notification-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml b/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml index e359a77c2cac..ba77007f194d 100644 --- a/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml +++ b/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework provisioning-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/provisioning/pom.xml b/features/provisioning/pom.xml index 70f3830b9b88..053434bd107f 100644 --- a/features/provisioning/pom.xml +++ b/features/provisioning/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml b/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml index cfadfa8f371e..29e0f34578f6 100644 --- a/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml +++ b/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework role-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml b/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml index 2420b16af07b..9834f3aa8e50 100644 --- a/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml +++ b/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework role-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/features/role-mgt/pom.xml b/features/role-mgt/pom.xml index 6a27dead8c6d..665492310851 100644 --- a/features/role-mgt/pom.xml +++ b/features/role-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml 4.0.0 diff --git a/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml b/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml index f9a954eb5f48..2fe0aa759e71 100644 --- a/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml +++ b/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework rule-management-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/rule-mgt/pom.xml b/features/rule-mgt/pom.xml index d27151b147ea..570c4675292b 100644 --- a/features/rule-mgt/pom.xml +++ b/features/rule-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml b/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml index faf11afaf408..d0df90937e66 100644 --- a/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml +++ b/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework secret-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 4.0.0 diff --git a/features/secret-mgt/pom.xml b/features/secret-mgt/pom.xml index 2fe1e73274e6..c744f88b50be 100644 --- a/features/secret-mgt/pom.xml +++ b/features/secret-mgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml b/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml index d4f298dfb63b..d0930a1fab28 100644 --- a/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml +++ b/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml b/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml index 60835a43bb00..ca886b249969 100644 --- a/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml +++ b/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml b/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml index 030a1364f296..65c8a19bab09 100644 --- a/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml +++ b/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/security-mgt/pom.xml b/features/security-mgt/pom.xml index 27a68fcd5fd0..2194997cd5b6 100644 --- a/features/security-mgt/pom.xml +++ b/features/security-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml b/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml index ea5f3ac6f831..a17c680d0457 100644 --- a/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml +++ b/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml @@ -21,7 +21,7 @@ template-management-feature org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml b/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml index 2353f6ca8796..2f0735e1fdf8 100644 --- a/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml +++ b/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ template-management-feature org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml b/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml index fde353cf2694..09e197b36078 100644 --- a/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml +++ b/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ template-management-feature org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/template-mgt/pom.xml b/features/template-mgt/pom.xml index 7942d839926b..2a5a9330ebb9 100644 --- a/features/template-mgt/pom.xml +++ b/features/template-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml b/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml index 823bac123b60..1f305634655a 100644 --- a/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml +++ b/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework trusted-app-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/trusted-app-mgt/pom.xml b/features/trusted-app-mgt/pom.xml index c89e1b926b64..b67f98d27db8 100644 --- a/features/trusted-app-mgt/pom.xml +++ b/features/trusted-app-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml 4.0.0 diff --git a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml index 489505e13981..00b569eebf3e 100644 --- a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml +++ b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml @@ -21,7 +21,7 @@ user-functionality-mgt-feature org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml index e6ad4b35f408..6ed495662820 100644 --- a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml +++ b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ user-functionality-mgt-feature org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 4.0.0 diff --git a/features/user-functionality-mgt/pom.xml b/features/user-functionality-mgt/pom.xml index b13cebc177a6..edb108e71a93 100644 --- a/features/user-functionality-mgt/pom.xml +++ b/features/user-functionality-mgt/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml 4.0.0 diff --git a/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml index 6e01a4b80cd8..eba0b80ff23b 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml index c360e5fc7ca4..68e185416c0d 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml index 52655c573822..3e2b77a80484 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml index a5eda805e296..9812229a821b 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml index bcd417107714..62bf8eef7a75 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml index 9083f78953a9..978d035caa40 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml index 9f8597922469..5b4d5a7b1b9c 100644 --- a/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml b/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml index 2c934f2efea5..fdd2d398226f 100644 --- a/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml b/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml index e741cd26efa0..a73a1de05cf8 100644 --- a/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml index 8fca965db1b3..09148f669c93 100644 --- a/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-mgt/pom.xml b/features/user-mgt/pom.xml index 91eba9506b13..56f39e02e80e 100644 --- a/features/user-mgt/pom.xml +++ b/features/user-mgt/pom.xml @@ -17,7 +17,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml b/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml index 5e83074483e1..26c428105459 100644 --- a/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml +++ b/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework user-store-feature - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/features/user-store/pom.xml b/features/user-store/pom.xml index e1c202865869..2dcc2a99843d 100644 --- a/features/user-store/pom.xml +++ b/features/user-store/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/pom.xml b/pom.xml index 0e46b89e2a92..a6277bf6b4de 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework pom - 7.7.34-SNAPSHOT + 7.7.34 WSO2 Carbon - Platform Aggregator Pom http://wso2.org @@ -36,7 +36,7 @@ https://github.com/wso2/carbon-identity-framework.git scm:git:https://github.com/wso2/carbon-identity-framework.git scm:git:https://github.com/wso2/carbon-identity-framework.git - HEAD + v7.7.34 diff --git a/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml index 75c81aaf68a0..7e1332b95c58 100644 --- a/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml index 1d24fff2cd42..97e82d904e64 100644 --- a/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml index 49908152f0e7..b9de2cdd36fd 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml 4.0.0 diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml index de907706c9a3..447b8a96eb29 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml index 07210aeaa64d..9013c963a39b 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml index 11730f26bdce..d2df06099f43 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml index e49e92921437..6e059bd3dac6 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml @@ -21,7 +21,7 @@ carbon-service-stubs org.wso2.carbon.identity.framework - 7.7.34-SNAPSHOT + 7.7.34 4.0.0 diff --git a/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml index 9ca8a1371df0..d07d6deeaa08 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml index 0e07820ba5f0..4f72b9a8e713 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml index 9b306b612349..e6b98f3982db 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml index 038d69207a55..5a43abb9e565 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml index c751c15c13f1..37612d162f07 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml index fdaac8454006..2df8c7575a72 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml index fda9fe176250..f3df974e2b3c 100644 --- a/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml index abf753d1095a..1d7fb3fdf636 100644 --- a/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml index 63cc83534b4c..e0a7354b0f79 100644 --- a/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34-SNAPSHOT + 7.7.34 ../pom.xml diff --git a/service-stubs/identity/pom.xml b/service-stubs/identity/pom.xml index b42ef27dcb17..4ed741d7d730 100644 --- a/service-stubs/identity/pom.xml +++ b/service-stubs/identity/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.testutil/pom.xml b/test-utils/org.wso2.carbon.identity.testutil/pom.xml index 633903add050..a05dee9e7663 100644 --- a/test-utils/org.wso2.carbon.identity.testutil/pom.xml +++ b/test-utils/org.wso2.carbon.identity.testutil/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34-SNAPSHOT + 7.7.34 ../../pom.xml From 58fca5757c22776048cfcc7a4fdc2827ab9398af Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 12 Dec 2024 16:59:01 +0000 Subject: [PATCH 05/20] [WSO2 Release] [Jenkins #8140] [Release 7.7.34] prepare for next development iteration --- .../org.wso2.carbon.identity.action.execution/pom.xml | 2 +- .../org.wso2.carbon.identity.action.management/pom.xml | 2 +- components/action-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.api.resource.mgt/pom.xml | 2 +- components/api-resource-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.application.common/pom.xml | 2 +- .../org.wso2.carbon.identity.application.mgt.ui/pom.xml | 2 +- .../org.wso2.carbon.identity.application.mgt/pom.xml | 2 +- components/application-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- components/authentication-framework/pom.xml | 2 +- components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml | 2 +- components/captcha-mgt/pom.xml | 2 +- components/carbon-authenticators/pom.xml | 2 +- .../org.wso2.carbon.identity.authenticator.thrift/pom.xml | 2 +- components/carbon-authenticators/thrift-authenticator/pom.xml | 2 +- .../org.wso2.carbon.identity.central.log.mgt/pom.xml | 2 +- components/central-logger/pom.xml | 2 +- .../org.wso2.carbon.identity.certificate.management/pom.xml | 2 +- components/certificate-mgt/pom.xml | 2 +- components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml | 2 +- components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml | 2 +- .../org.wso2.carbon.identity.claim.metadata.mgt/pom.xml | 2 +- components/claim-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.client.attestation.mgt/pom.xml | 2 +- components/client-attestation-mgt/pom.xml | 2 +- .../pom.xml | 4 ++-- .../org.wso2.carbon.identity.configuration.mgt.core/pom.xml | 2 +- .../pom.xml | 2 +- components/configuration-mgt/pom.xml | 2 +- .../consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml | 2 +- components/consent-mgt/pom.xml | 2 +- .../pom.xml | 2 +- components/consent-server-configs-mgt/pom.xml | 2 +- .../cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml | 2 +- components/cors-mgt/pom.xml | 2 +- .../org.wso2.carbon.directory.server.manager.common/pom.xml | 2 +- .../org.wso2.carbon.directory.server.manager.ui/pom.xml | 2 +- .../org.wso2.carbon.directory.server.manager/pom.xml | 2 +- components/directory-server-manager/pom.xml | 2 +- .../org.wso2.carbon.identity.extension.mgt/pom.xml | 2 +- components/extension-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml | 2 +- .../org.wso2.carbon.identity.functions.library.mgt/pom.xml | 2 +- components/functions-library-mgt/pom.xml | 2 +- .../identity-core/org.wso2.carbon.identity.base/pom.xml | 2 +- .../identity-core/org.wso2.carbon.identity.core.ui/pom.xml | 2 +- .../identity-core/org.wso2.carbon.identity.core/pom.xml | 2 +- components/identity-core/pom.xml | 2 +- .../identity-event/org.wso2.carbon.identity.event/pom.xml | 2 +- components/identity-event/pom.xml | 2 +- .../org.wso2.carbon.identity.mgt.endpoint.util/pom.xml | 2 +- .../identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml | 2 +- components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml | 2 +- components/identity-mgt/pom.xml | 2 +- components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml | 2 +- components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml | 2 +- components/idp-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.input.validation.mgt/pom.xml | 2 +- components/input-validation-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.unique.claim.mgt/pom.xml | 2 +- components/multi-attribute-login/pom.xml | 2 +- .../org.wso2.carbon.identity.notification.mgt/pom.xml | 2 +- components/notification-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.provisioning/pom.xml | 2 +- components/provisioning/pom.xml | 2 +- .../role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml | 2 +- .../org.wso2.carbon.identity.role.v2.mgt.core/pom.xml | 2 +- components/role-mgt/pom.xml | 2 +- .../rule-mgt/org.wso2.carbon.identity.rule.metadata/pom.xml | 2 +- components/rule-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.secret.mgt.core/pom.xml | 2 +- components/secret-mgt/pom.xml | 2 +- .../security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml | 2 +- components/security-mgt/org.wso2.carbon.security.mgt/pom.xml | 2 +- components/security-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.template.mgt.ui/pom.xml | 2 +- .../org.wso2.carbon.identity.template.mgt/pom.xml | 2 +- components/template-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.trusted.app.mgt/pom.xml | 2 +- components/trusted-app-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.user.functionality.mgt/pom.xml | 2 +- components/user-functionality-mgt/pom.xml | 2 +- .../user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml | 2 +- .../user-mgt/org.wso2.carbon.identity.user.profile/pom.xml | 2 +- .../org.wso2.carbon.identity.user.registration/pom.xml | 2 +- components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml | 2 +- components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml | 2 +- components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml | 2 +- components/user-mgt/org.wso2.carbon.user.mgt/pom.xml | 2 +- components/user-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.user.store.configuration/pom.xml | 2 +- .../org.wso2.carbon.identity.user.store.count/pom.xml | 2 +- components/user-store/pom.xml | 2 +- .../pom.xml | 2 +- features/action-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/api-resource-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.application.mgt.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/application-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/authentication-framework/pom.xml | 2 +- features/carbon-authenticators/pom.xml | 2 +- .../pom.xml | 2 +- features/carbon-authenticators/thrift-authenticator/pom.xml | 2 +- features/categories/authorization/pom.xml | 2 +- features/categories/inbound-authentication/pom.xml | 2 +- features/categories/inbound-provisioning/pom.xml | 2 +- features/categories/keystore-mgt/pom.xml | 2 +- features/categories/notification-mgt/pom.xml | 2 +- features/categories/outbound-authentication/pom.xml | 2 +- features/categories/outbound-provisioning/pom.xml | 2 +- features/categories/pom.xml | 2 +- features/categories/user-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/central-logger/pom.xml | 2 +- .../pom.xml | 2 +- features/certificate-mgt/pom.xml | 2 +- features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml | 2 +- .../org.wso2.carbon.claim.mgt.server.feature/pom.xml | 2 +- .../claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml | 2 +- features/claim-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/client-attestation-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/configuration-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/consent-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/consent-server-configs-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml | 2 +- features/cors-mgt/pom.xml | 2 +- .../org.wso2.carbon.directory.service.mgr.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml | 2 +- features/directory-server-manager/pom.xml | 2 +- .../org.wso2.carbon.identity.extension.mgt.feature/pom.xml | 2 +- features/extension-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/functions-library-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.core.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.core.server.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.core.ui.feature/pom.xml | 2 +- features/identity-core/pom.xml | 2 +- .../org.wso2.carbon.identity.event.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.event.server.feature/pom.xml | 2 +- features/identity-event/pom.xml | 2 +- .../identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.mgt.server.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.mgt.ui.feature/pom.xml | 2 +- features/identity-mgt/pom.xml | 2 +- features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml | 2 +- .../idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml | 2 +- features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml | 2 +- features/idp-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/input-validation-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/multi-attribute-login/pom.xml | 2 +- .../org.wso2.carbon.identity.notification.mgt.feature/pom.xml | 2 +- .../pom.xml | 2 +- features/notification-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/provisioning/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/role-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/rule-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/secret-mgt/pom.xml | 2 +- .../security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml | 2 +- .../org.wso2.carbon.security.mgt.server.feature/pom.xml | 2 +- .../org.wso2.carbon.security.mgt.ui.feature/pom.xml | 2 +- features/security-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.template.mgt.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml | 2 +- features/template-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/trusted-app-mgt/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/user-functionality-mgt/pom.xml | 2 +- .../org.wso2.carbon.identity.user.profile.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.user.profile.ui.feature/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml | 2 +- features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml | 2 +- .../user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml | 2 +- features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml | 2 +- features/user-mgt/pom.xml | 2 +- .../pom.xml | 2 +- features/user-store/pom.xml | 2 +- pom.xml | 4 ++-- service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.directory.server.manager.stub/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.application.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml | 2 +- .../pom.xml | 2 +- .../identity/org.wso2.carbon.identity.governance.stub/pom.xml | 2 +- .../identity/org.wso2.carbon.identity.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.user.profile.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.user.registration.stub/pom.xml | 2 +- .../pom.xml | 2 +- .../org.wso2.carbon.identity.user.store.count.stub/pom.xml | 2 +- service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml | 2 +- .../identity/org.wso2.carbon.security.mgt.stub/pom.xml | 2 +- service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml | 2 +- service-stubs/identity/pom.xml | 2 +- test-utils/org.wso2.carbon.identity.testutil/pom.xml | 2 +- 227 files changed, 229 insertions(+), 229 deletions(-) diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml b/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml index a02d4d04c530..ffd8f4a55c2a 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework action-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml b/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml index 5a102054333b..c1400ff985e5 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml +++ b/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework action-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/action-mgt/pom.xml b/components/action-mgt/pom.xml index d854edce4411..53398148876c 100644 --- a/components/action-mgt/pom.xml +++ b/components/action-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml index 6b56c7676577..b832b1ad7b6d 100644 --- a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml +++ b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework api-resource-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml index 4e4718cde9c0..99c04647c1bd 100644 --- a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml +++ b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework api-resource-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml org.wso2.carbon.identity.api.resource.mgt diff --git a/components/api-resource-mgt/pom.xml b/components/api-resource-mgt/pom.xml index 38d84f49fefb..12f263d143fc 100644 --- a/components/api-resource-mgt/pom.xml +++ b/components/api-resource-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml index 0c5cf44cf0f4..6bc33b714a73 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml +++ b/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.framework application-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml index f0c005e782f0..a185d145f465 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework application-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml index cb59aa863ac6..721902b7d543 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml org.wso2.carbon.identity.application.mgt diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml index 83de73657363..81a4724b446a 100644 --- a/components/application-mgt/pom.xml +++ b/components/application-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml index fc4256468984..c99a22c320c6 100644 --- a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml +++ b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework authentication-framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml index b2e1b62daf4f..fa9dd4106242 100644 --- a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml +++ b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework authentication-framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/authentication-framework/pom.xml b/components/authentication-framework/pom.xml index c3ae9162f806..ceb1978c2c52 100644 --- a/components/authentication-framework/pom.xml +++ b/components/authentication-framework/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml b/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml index feee2f557943..f90a60892e08 100644 --- a/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml +++ b/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework captcha-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/captcha-mgt/pom.xml b/components/captcha-mgt/pom.xml index dfcf24904792..fb27da13755a 100644 --- a/components/captcha-mgt/pom.xml +++ b/components/captcha-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/carbon-authenticators/pom.xml b/components/carbon-authenticators/pom.xml index e3b499218d7e..e2dd2ec3983e 100644 --- a/components/carbon-authenticators/pom.xml +++ b/components/carbon-authenticators/pom.xml @@ -17,7 +17,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml b/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml index ec4e19f11486..6b9df879688b 100644 --- a/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml +++ b/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework thrift-authenticator - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/carbon-authenticators/thrift-authenticator/pom.xml b/components/carbon-authenticators/thrift-authenticator/pom.xml index db7da8e1d72f..50fb428522af 100644 --- a/components/carbon-authenticators/thrift-authenticator/pom.xml +++ b/components/carbon-authenticators/thrift-authenticator/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework carbon-authenticators - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml b/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml index 1efe4c4d932b..84f6cc523158 100644 --- a/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml +++ b/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml @@ -21,7 +21,7 @@ central-logger org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/central-logger/pom.xml b/components/central-logger/pom.xml index f2066a8f4690..5e7b6ef46e19 100644 --- a/components/central-logger/pom.xml +++ b/components/central-logger/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml b/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml index afb2ba214e0b..646985819060 100644 --- a/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework certificate-mgt - 7.7.34 + 7.7.35-SNAPSHOT 4.0.0 diff --git a/components/certificate-mgt/pom.xml b/components/certificate-mgt/pom.xml index d0663bf6ad48..2ad537a61e42 100644 --- a/components/certificate-mgt/pom.xml +++ b/components/certificate-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml b/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml index 4e4b760c0440..4c68e9bd9b70 100644 --- a/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml b/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml index 36ace2f971da..2417db51669a 100644 --- a/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml index ff50ad6a2280..9d11250c192a 100644 --- a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml index 004ac887ed92..d8dadfb1d6a4 100644 --- a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/claim-mgt/pom.xml b/components/claim-mgt/pom.xml index ea34b67999a7..278782bd9911 100644 --- a/components/claim-mgt/pom.xml +++ b/components/claim-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml b/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml index 2db235dc74b6..5371c135fe78 100644 --- a/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml +++ b/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework client-attestation-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/client-attestation-mgt/pom.xml b/components/client-attestation-mgt/pom.xml index 176b092cea8d..13518e508ea4 100644 --- a/components/client-attestation-mgt/pom.xml +++ b/components/client-attestation-mgt/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml index b6c7c932d7b8..e140ddd89fba 100644 --- a/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml +++ b/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml @@ -23,11 +23,11 @@ org.wso2.carbon.identity.framework configuration-mgt - 7.7.34 + 7.7.35-SNAPSHOT org.wso2.carbon.identity.api.server.configuration.mgt - 7.7.34 + 7.7.35-SNAPSHOT jar WSO2 Carbon - Configuration Management API Identity Configuration Management API diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml index c80fe438a5dc..f5bcd69ea6b7 100644 --- a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml +++ b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework configuration-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml index 848a3d20298d..15203eccb834 100644 --- a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml +++ b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework configuration-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/configuration-mgt/pom.xml b/components/configuration-mgt/pom.xml index 3866784a01bd..14d7aae529ea 100644 --- a/components/configuration-mgt/pom.xml +++ b/components/configuration-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml b/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml index de83ec90e95c..02c80a76d10f 100644 --- a/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml +++ b/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework consent-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/consent-mgt/pom.xml b/components/consent-mgt/pom.xml index f2d3df5aa5bb..e688426b4bb0 100644 --- a/components/consent-mgt/pom.xml +++ b/components/consent-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml b/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml index c70c936277c2..b6ce16e266d1 100644 --- a/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml +++ b/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework consent-server-configs-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/consent-server-configs-mgt/pom.xml b/components/consent-server-configs-mgt/pom.xml index cb263f367fd1..7ac724168163 100644 --- a/components/consent-server-configs-mgt/pom.xml +++ b/components/consent-server-configs-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml b/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml index 6325d5ede27f..e054e2e4019f 100644 --- a/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml +++ b/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework cors-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/cors-mgt/pom.xml b/components/cors-mgt/pom.xml index cabf6f0b9ff3..0978b9462dad 100644 --- a/components/cors-mgt/pom.xml +++ b/components/cors-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml index 9d42c7c598e4..f1fdf1c2faf3 100644 --- a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml +++ b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework directory-server-manager - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml index 4b95f197d5c0..31b070660c28 100644 --- a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml +++ b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml b/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml index f1846dfd4b31..5e6ebabb09ef 100644 --- a/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml +++ b/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/directory-server-manager/pom.xml b/components/directory-server-manager/pom.xml index 04b2c85cea50..1d84a120de06 100644 --- a/components/directory-server-manager/pom.xml +++ b/components/directory-server-manager/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml b/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml index 36f7b72b1458..161ca168caef 100644 --- a/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml +++ b/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework extension-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/extension-mgt/pom.xml b/components/extension-mgt/pom.xml index 2e94dd0a3728..c185b5462ccc 100644 --- a/components/extension-mgt/pom.xml +++ b/components/extension-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml index 4f5d6ad51470..9137bc3786bc 100644 --- a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml +++ b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml @@ -21,7 +21,7 @@ functions-library-mgt org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml index 7034f0a1c356..adda21967ea4 100644 --- a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml +++ b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml @@ -21,7 +21,7 @@ functions-library-mgt org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/functions-library-mgt/pom.xml b/components/functions-library-mgt/pom.xml index e3f5e9567aff..37068991a19d 100644 --- a/components/functions-library-mgt/pom.xml +++ b/components/functions-library-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/identity-core/org.wso2.carbon.identity.base/pom.xml b/components/identity-core/org.wso2.carbon.identity.base/pom.xml index 24934806abab..ac85153d26e8 100644 --- a/components/identity-core/org.wso2.carbon.identity.base/pom.xml +++ b/components/identity-core/org.wso2.carbon.identity.base/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-core - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml b/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml index f3cd0b6ed466..75cf171c3c13 100644 --- a/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml +++ b/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/identity-core/org.wso2.carbon.identity.core/pom.xml b/components/identity-core/org.wso2.carbon.identity.core/pom.xml index bcdcfc524643..db9eb5ae1f33 100644 --- a/components/identity-core/org.wso2.carbon.identity.core/pom.xml +++ b/components/identity-core/org.wso2.carbon.identity.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-core - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/identity-core/pom.xml b/components/identity-core/pom.xml index 0bedcda1de53..200fac72894b 100644 --- a/components/identity-core/pom.xml +++ b/components/identity-core/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/identity-event/org.wso2.carbon.identity.event/pom.xml b/components/identity-event/org.wso2.carbon.identity.event/pom.xml index e58c487ab0a4..18e6ad0c7f2e 100644 --- a/components/identity-event/org.wso2.carbon.identity.event/pom.xml +++ b/components/identity-event/org.wso2.carbon.identity.event/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-event - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/identity-event/pom.xml b/components/identity-event/pom.xml index b60a41514ccc..7f9c36bcc3f6 100644 --- a/components/identity-event/pom.xml +++ b/components/identity-event/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml b/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml index 29d97426bcf6..4e7ec7d78d42 100644 --- a/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml +++ b/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml b/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml index ed3e7748fb68..b103f645833c 100644 --- a/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml +++ b/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework identity-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml b/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml index 10c82d740e2a..c3181e865dc5 100644 --- a/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml +++ b/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/identity-mgt/pom.xml b/components/identity-mgt/pom.xml index c4df894728b6..20da61538a61 100644 --- a/components/identity-mgt/pom.xml +++ b/components/identity-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml b/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml index adcb1719eef1..31a448ab011d 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml b/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml index 12d0d2a7608d..628ee1f2f8ce 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-provider-management - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/idp-mgt/pom.xml b/components/idp-mgt/pom.xml index 7fc420e59dfe..ccb20f4bb4b3 100644 --- a/components/idp-mgt/pom.xml +++ b/components/idp-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml b/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml index f888a543c4bc..5161f0d49f8b 100644 --- a/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml +++ b/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework input-validation-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/input-validation-mgt/pom.xml b/components/input-validation-mgt/pom.xml index 370edd587091..a57b98efc9e5 100644 --- a/components/input-validation-mgt/pom.xml +++ b/components/input-validation-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml b/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml index 092c01fd4735..fd479722799a 100644 --- a/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml +++ b/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml @@ -21,7 +21,7 @@ multi-attribute-login org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml b/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml index 42baeaf8c5e2..b0b5330057b2 100644 --- a/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml +++ b/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml @@ -21,7 +21,7 @@ multi-attribute-login org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/multi-attribute-login/pom.xml b/components/multi-attribute-login/pom.xml index dda275cff47f..65b09769ec1e 100644 --- a/components/multi-attribute-login/pom.xml +++ b/components/multi-attribute-login/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml b/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml index 71e206f76ae0..d2383bfdb0fc 100644 --- a/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml +++ b/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework notification-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/notification-mgt/pom.xml b/components/notification-mgt/pom.xml index 504aada07d3c..2ebfa9197583 100644 --- a/components/notification-mgt/pom.xml +++ b/components/notification-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml b/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml index 822874194930..a247ede8349d 100644 --- a/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml +++ b/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework provisioning - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/provisioning/pom.xml b/components/provisioning/pom.xml index 0936e6b8fca0..5dee55649259 100644 --- a/components/provisioning/pom.xml +++ b/components/provisioning/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml b/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml index 882d04c556b4..c4dee364c89f 100644 --- a/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml +++ b/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework role-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml b/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml index 860bd1b632c6..c5d18bf07ee6 100644 --- a/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml +++ b/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework role-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/role-mgt/pom.xml b/components/role-mgt/pom.xml index 78ea2cb90217..de227f73f00f 100644 --- a/components/role-mgt/pom.xml +++ b/components/role-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.metadata/pom.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.metadata/pom.xml index bf692e4ce5a5..cb68b6bc52d5 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.metadata/pom.xml +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.metadata/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework rule-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/rule-mgt/pom.xml b/components/rule-mgt/pom.xml index 22985acdf14f..814d42baceb0 100644 --- a/components/rule-mgt/pom.xml +++ b/components/rule-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml b/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml index f454f13ad1d9..9566d9127337 100644 --- a/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml +++ b/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework secret-mgt - 7.7.34 + 7.7.35-SNAPSHOT 4.0.0 diff --git a/components/secret-mgt/pom.xml b/components/secret-mgt/pom.xml index 803a14ae18a9..a2dcb4af36fa 100644 --- a/components/secret-mgt/pom.xml +++ b/components/secret-mgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml b/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml index 1eea58c1470e..b5f2045641e0 100644 --- a/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml +++ b/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml b/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml index 877ef14cfe87..44ee65703f52 100644 --- a/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml +++ b/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/security-mgt/pom.xml b/components/security-mgt/pom.xml index 529613c8f59b..e7dd6b2e39c5 100644 --- a/components/security-mgt/pom.xml +++ b/components/security-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml b/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml index e76d39489a4a..561b37241420 100644 --- a/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml +++ b/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework template-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml b/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml index c118a2dd0437..cc347fe745a4 100644 --- a/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml +++ b/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework template-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/template-mgt/pom.xml b/components/template-mgt/pom.xml index ab8668ac6aa8..1939e13b65d8 100644 --- a/components/template-mgt/pom.xml +++ b/components/template-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml b/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml index 6f987a27c7f2..cc578a0e31c1 100644 --- a/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml +++ b/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework trusted-app-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/trusted-app-mgt/pom.xml b/components/trusted-app-mgt/pom.xml index ef4865bfce32..59ea8f9abdcc 100644 --- a/components/trusted-app-mgt/pom.xml +++ b/components/trusted-app-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml b/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml index aa5e30ce641d..540dde6ac7fc 100644 --- a/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml +++ b/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml @@ -21,7 +21,7 @@ user-functionality-mgt org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT 4.0.0 diff --git a/components/user-functionality-mgt/pom.xml b/components/user-functionality-mgt/pom.xml index ed8e37e880bf..10d7609496ce 100644 --- a/components/user-functionality-mgt/pom.xml +++ b/components/user-functionality-mgt/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml index 9f5ce9b2a30d..0a15dcb0c8c1 100644 --- a/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml +++ b/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml index 4e5d313d1deb..0b3a588f644e 100644 --- a/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml +++ b/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml index a1aae59b29b8..7e3d20226de9 100644 --- a/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml +++ b/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml b/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml index 88f99d9667f1..b91368e53d4d 100644 --- a/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml +++ b/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml b/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml index 6ec86bc63b0b..b0bf7f6192cd 100644 --- a/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml +++ b/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml b/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml index 6d265a0e5df1..bd6e0d08b5f6 100644 --- a/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml +++ b/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml b/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml index 22342e194508..451bea54ae33 100644 --- a/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml +++ b/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/pom.xml b/components/user-mgt/pom.xml index 358274937e3f..84ff2fa8e08e 100644 --- a/components/user-mgt/pom.xml +++ b/components/user-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml index 8ce9ad13e53b..18d67c4d3e9f 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml index 20950aefddd0..3a0994b0826c 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml index e7701330b6b9..d4cbc5feb821 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml index bf7d410242e3..b9497d4f64c0 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/components/user-store/pom.xml b/components/user-store/pom.xml index 501e8933081b..2555c2d17e31 100644 --- a/components/user-store/pom.xml +++ b/components/user-store/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml b/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml index e49c1a294924..9a8edd92fffa 100644 --- a/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml +++ b/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework action-management-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/action-mgt/pom.xml b/features/action-mgt/pom.xml index 334d9583091f..9f666c64c3de 100644 --- a/features/action-mgt/pom.xml +++ b/features/action-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml index b4adb1ef5f47..4dadbb0403b9 100644 --- a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml +++ b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework api-resource-management-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/api-resource-mgt/pom.xml b/features/api-resource-mgt/pom.xml index a7a2b4132c34..2d164a840f6a 100644 --- a/features/api-resource-mgt/pom.xml +++ b/features/api-resource-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml b/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml index f32a80c4f9fb..0306d2302c80 100644 --- a/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml b/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml index 520e5dbc51f0..2c47b01b9c65 100644 --- a/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml b/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml index c3fb47d8bd2d..e26cee5c0230 100644 --- a/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml index eeef1e19bfa7..46928f3fb2af 100644 --- a/features/application-mgt/pom.xml +++ b/features/application-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml b/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml index 9abb602c35bd..26ea9afbe3a6 100644 --- a/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml +++ b/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework authentication-framework-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/authentication-framework/pom.xml b/features/authentication-framework/pom.xml index 3a07b3f07dd4..cc4cd8075e2e 100644 --- a/features/authentication-framework/pom.xml +++ b/features/authentication-framework/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/carbon-authenticators/pom.xml b/features/carbon-authenticators/pom.xml index 2b68d4df564f..6a4213681348 100644 --- a/features/carbon-authenticators/pom.xml +++ b/features/carbon-authenticators/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml b/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml index 9f1e1a349c6b..fdced151bc6a 100644 --- a/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml +++ b/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework thrift-authenticator-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/carbon-authenticators/thrift-authenticator/pom.xml b/features/carbon-authenticators/thrift-authenticator/pom.xml index 919151a6aecc..ff9f56ec6647 100644 --- a/features/carbon-authenticators/thrift-authenticator/pom.xml +++ b/features/carbon-authenticators/thrift-authenticator/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-authenticator-features - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/categories/authorization/pom.xml b/features/categories/authorization/pom.xml index 93efec4e7380..00933a81e5a9 100644 --- a/features/categories/authorization/pom.xml +++ b/features/categories/authorization/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../../pom.xml diff --git a/features/categories/inbound-authentication/pom.xml b/features/categories/inbound-authentication/pom.xml index 5a9a2fbd1177..d6e99b2577a3 100644 --- a/features/categories/inbound-authentication/pom.xml +++ b/features/categories/inbound-authentication/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../../pom.xml diff --git a/features/categories/inbound-provisioning/pom.xml b/features/categories/inbound-provisioning/pom.xml index 0fcd2134a474..6c16eb0316dc 100644 --- a/features/categories/inbound-provisioning/pom.xml +++ b/features/categories/inbound-provisioning/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../../pom.xml diff --git a/features/categories/keystore-mgt/pom.xml b/features/categories/keystore-mgt/pom.xml index b39c66728db2..e3fa6722b73a 100644 --- a/features/categories/keystore-mgt/pom.xml +++ b/features/categories/keystore-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../../pom.xml diff --git a/features/categories/notification-mgt/pom.xml b/features/categories/notification-mgt/pom.xml index 31dc051663f1..b9c0681bf9d4 100644 --- a/features/categories/notification-mgt/pom.xml +++ b/features/categories/notification-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../../pom.xml diff --git a/features/categories/outbound-authentication/pom.xml b/features/categories/outbound-authentication/pom.xml index 8cffc792f073..f5b1fcc61fca 100644 --- a/features/categories/outbound-authentication/pom.xml +++ b/features/categories/outbound-authentication/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../../pom.xml diff --git a/features/categories/outbound-provisioning/pom.xml b/features/categories/outbound-provisioning/pom.xml index d117dc1a45b5..2d3c12fbf6d9 100644 --- a/features/categories/outbound-provisioning/pom.xml +++ b/features/categories/outbound-provisioning/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../../pom.xml diff --git a/features/categories/pom.xml b/features/categories/pom.xml index 16590af65334..4b1ef78d1262 100644 --- a/features/categories/pom.xml +++ b/features/categories/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/categories/user-mgt/pom.xml b/features/categories/user-mgt/pom.xml index ac5410b5694f..a27005b6fe40 100644 --- a/features/categories/user-mgt/pom.xml +++ b/features/categories/user-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../../pom.xml diff --git a/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml b/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml index 7bd6de43ee5c..9ff410bec515 100644 --- a/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml +++ b/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework central-logger-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/central-logger/pom.xml b/features/central-logger/pom.xml index c658f60f5e01..72061259a679 100644 --- a/features/central-logger/pom.xml +++ b/features/central-logger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/certificate-mgt/org.wso2.carbon.identity.certificate.management.server.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.identity.certificate.management.server.feature/pom.xml index 4b6abed63848..43ccef044946 100644 --- a/features/certificate-mgt/org.wso2.carbon.identity.certificate.management.server.feature/pom.xml +++ b/features/certificate-mgt/org.wso2.carbon.identity.certificate.management.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework certificate-management-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/certificate-mgt/pom.xml b/features/certificate-mgt/pom.xml index 108d1e26cef0..0081f533429d 100644 --- a/features/certificate-mgt/pom.xml +++ b/features/certificate-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml index 9ad40a4876ca..0aa9606bb4ef 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml index 316cebfddd2b..a5d2e1adb046 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml index 66934b60c6bf..bca00770a7e7 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/claim-mgt/pom.xml b/features/claim-mgt/pom.xml index 64c14a66653e..7bf5964597c9 100644 --- a/features/claim-mgt/pom.xml +++ b/features/claim-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml b/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml index 9b909f6e0179..6d6d547707a2 100644 --- a/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml +++ b/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework client-attestation-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/client-attestation-mgt/pom.xml b/features/client-attestation-mgt/pom.xml index 5e36828f41bb..a3cd03d191d5 100644 --- a/features/client-attestation-mgt/pom.xml +++ b/features/client-attestation-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml b/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml index 5e5c6fc61f3f..42fd40a4bbfe 100644 --- a/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml +++ b/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework configuration-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/configuration-mgt/pom.xml b/features/configuration-mgt/pom.xml index 33e6b23cbd34..520701a5d14a 100644 --- a/features/configuration-mgt/pom.xml +++ b/features/configuration-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml b/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml index 88b7017d5395..64b42a86c6b4 100644 --- a/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml +++ b/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-consent-mgt-aggregator - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/consent-mgt/pom.xml b/features/consent-mgt/pom.xml index 38c0c7ac5726..9d5c67eb6d03 100644 --- a/features/consent-mgt/pom.xml +++ b/features/consent-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml b/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml index f55ab6e0b646..913b8f6d0e96 100644 --- a/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml +++ b/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework consent-server-configs-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/consent-server-configs-mgt/pom.xml b/features/consent-server-configs-mgt/pom.xml index 0e9dafb4b6f7..94bef491ae76 100644 --- a/features/consent-server-configs-mgt/pom.xml +++ b/features/consent-server-configs-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml b/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml index 2137e1999ed6..022e0c449b69 100644 --- a/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml +++ b/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework cors-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/cors-mgt/pom.xml b/features/cors-mgt/pom.xml index d803c08f086b..10963d6fb35b 100644 --- a/features/cors-mgt/pom.xml +++ b/features/cors-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml index 249d6ea8ff9b..d74b852b5ab4 100644 --- a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml +++ b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml index 6f43117a7968..e65a034dfaaf 100644 --- a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml +++ b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml index 8f090ddd1383..397378cf8955 100644 --- a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml +++ b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/directory-server-manager/pom.xml b/features/directory-server-manager/pom.xml index f2125aa20a22..99edb3de1954 100644 --- a/features/directory-server-manager/pom.xml +++ b/features/directory-server-manager/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml index 0045ee8ca62b..aaf34c80b249 100644 --- a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml +++ b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml @@ -19,7 +19,7 @@ extension-management-feature org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT org.wso2.carbon.identity.extension.mgt.feature diff --git a/features/extension-mgt/pom.xml b/features/extension-mgt/pom.xml index 23ceb76705aa..dbb89d1bff08 100644 --- a/features/extension-mgt/pom.xml +++ b/features/extension-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml index af8dc5eaad6f..9429b2ba37de 100644 --- a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml +++ b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework functions-library-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml index 6542084bc253..02853e8098db 100644 --- a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml +++ b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework functions-library-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml index 6f6b3b512167..6a7cb34f670e 100644 --- a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml +++ b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework functions-library-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/functions-library-mgt/pom.xml b/features/functions-library-mgt/pom.xml index 10d58e3fb85b..c59c622f1ff0 100644 --- a/features/functions-library-mgt/pom.xml +++ b/features/functions-library-mgt/pom.xml @@ -28,7 +28,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml b/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml index d8a9150dc752..7491523272b9 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml +++ b/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml b/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml index fc887920e66c..eb99e12e7190 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml b/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml index 7b3478829ed9..a5189f48a6b8 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml +++ b/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/identity-core/pom.xml b/features/identity-core/pom.xml index 17c9a2b86719..98efc4d8d962 100644 --- a/features/identity-core/pom.xml +++ b/features/identity-core/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml b/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml index a81d3cdec2ba..401b78c349a1 100644 --- a/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml +++ b/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-event-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml b/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml index f282573c52b2..8398c8b01f67 100644 --- a/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml +++ b/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-event-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/identity-event/pom.xml b/features/identity-event/pom.xml index 45533f17969d..566d572a51f8 100644 --- a/features/identity-event/pom.xml +++ b/features/identity-event/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml b/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml index 14167c266e54..b92cd183cf7a 100644 --- a/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml +++ b/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml b/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml index 7046917a7cde..e64ec6b334c7 100644 --- a/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml +++ b/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml b/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml index d29c7a623836..9419218e50cc 100644 --- a/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml +++ b/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/identity-mgt/pom.xml b/features/identity-mgt/pom.xml index febcf2088973..6f02b5b27447 100644 --- a/features/identity-mgt/pom.xml +++ b/features/identity-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml b/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml index 20a409f2beee..a58b100b6927 100644 --- a/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml +++ b/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml b/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml index e2afc547ce2e..9a51822d68fe 100644 --- a/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml +++ b/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml b/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml index efb1b594b239..aa366b6de511 100644 --- a/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml +++ b/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/idp-mgt/pom.xml b/features/idp-mgt/pom.xml index 8a33056ee8c6..6b3e4b370ce4 100644 --- a/features/idp-mgt/pom.xml +++ b/features/idp-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml b/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml index 4437777f2888..3883a256ca9a 100644 --- a/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml +++ b/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework input-validation-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/input-validation-mgt/pom.xml b/features/input-validation-mgt/pom.xml index ebe13eef1ff6..6755a558f049 100644 --- a/features/input-validation-mgt/pom.xml +++ b/features/input-validation-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml b/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml index 45be2065d7c3..bcc256382c1e 100644 --- a/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml +++ b/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ multi-attribute-login-feature org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml b/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml index 9c1db27b2596..72f6d5a50446 100644 --- a/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml +++ b/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ multi-attribute-login-feature org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/multi-attribute-login/pom.xml b/features/multi-attribute-login/pom.xml index cfe5e88681f7..8454e70469a0 100644 --- a/features/multi-attribute-login/pom.xml +++ b/features/multi-attribute-login/pom.xml @@ -20,7 +20,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml index 51250c717651..4246dddcf5e1 100644 --- a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml +++ b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-notification-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml index 21fd138f3e89..1b3c06fdf00e 100644 --- a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml +++ b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-notification-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/notification-mgt/pom.xml b/features/notification-mgt/pom.xml index e4e668b6d154..ce8e00a657cf 100644 --- a/features/notification-mgt/pom.xml +++ b/features/notification-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml b/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml index ba77007f194d..f82d7e23744c 100644 --- a/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml +++ b/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework provisioning-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/provisioning/pom.xml b/features/provisioning/pom.xml index 053434bd107f..5d66f3771e0e 100644 --- a/features/provisioning/pom.xml +++ b/features/provisioning/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml b/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml index 29e0f34578f6..a46c350a29a7 100644 --- a/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml +++ b/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework role-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml b/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml index 9834f3aa8e50..0130243c00b6 100644 --- a/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml +++ b/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework role-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/role-mgt/pom.xml b/features/role-mgt/pom.xml index 665492310851..af15e5027343 100644 --- a/features/role-mgt/pom.xml +++ b/features/role-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml b/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml index 2fe0aa759e71..bcd7c395d044 100644 --- a/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml +++ b/features/rule-mgt/org.wso2.carbon.identity.rule.management.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework rule-management-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/rule-mgt/pom.xml b/features/rule-mgt/pom.xml index 570c4675292b..5dcce307f2f5 100644 --- a/features/rule-mgt/pom.xml +++ b/features/rule-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml b/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml index d0df90937e66..3c5ad166dd72 100644 --- a/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml +++ b/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework secret-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT 4.0.0 diff --git a/features/secret-mgt/pom.xml b/features/secret-mgt/pom.xml index c744f88b50be..0a6de1d90cc3 100644 --- a/features/secret-mgt/pom.xml +++ b/features/secret-mgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml b/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml index d0930a1fab28..40e85613a69c 100644 --- a/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml +++ b/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml b/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml index ca886b249969..05986fc72d81 100644 --- a/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml +++ b/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml b/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml index 65c8a19bab09..a78afb56b7e3 100644 --- a/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml +++ b/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/security-mgt/pom.xml b/features/security-mgt/pom.xml index 2194997cd5b6..5734bd8279b8 100644 --- a/features/security-mgt/pom.xml +++ b/features/security-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml b/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml index a17c680d0457..be52ac2b1908 100644 --- a/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml +++ b/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml @@ -21,7 +21,7 @@ template-management-feature org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml b/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml index 2f0735e1fdf8..4d690c94c854 100644 --- a/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml +++ b/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ template-management-feature org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml b/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml index 09e197b36078..8d2e05ff1bd8 100644 --- a/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml +++ b/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ template-management-feature org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/template-mgt/pom.xml b/features/template-mgt/pom.xml index 2a5a9330ebb9..441720d1706d 100644 --- a/features/template-mgt/pom.xml +++ b/features/template-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml b/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml index 1f305634655a..4d46286219e5 100644 --- a/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml +++ b/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework trusted-app-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/trusted-app-mgt/pom.xml b/features/trusted-app-mgt/pom.xml index b67f98d27db8..12fc579b9e1d 100644 --- a/features/trusted-app-mgt/pom.xml +++ b/features/trusted-app-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml index 00b569eebf3e..ebf5e0f57e5a 100644 --- a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml +++ b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml @@ -21,7 +21,7 @@ user-functionality-mgt-feature org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml index 6ed495662820..31524d967a1c 100644 --- a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml +++ b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ user-functionality-mgt-feature org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT 4.0.0 diff --git a/features/user-functionality-mgt/pom.xml b/features/user-functionality-mgt/pom.xml index edb108e71a93..ac72ee377953 100644 --- a/features/user-functionality-mgt/pom.xml +++ b/features/user-functionality-mgt/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml index eba0b80ff23b..1019fc21c337 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml index 68e185416c0d..92a7b5373d66 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml index 3e2b77a80484..2dcb7bc85d2b 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml index 9812229a821b..5fb7b44a0e3a 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml index 62bf8eef7a75..ad060a99fabf 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml index 978d035caa40..5316cb811468 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml index 5b4d5a7b1b9c..fff5cb75ca6e 100644 --- a/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml b/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml index fdd2d398226f..d94fa40721c0 100644 --- a/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml b/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml index a73a1de05cf8..7022df51b3c2 100644 --- a/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml index 09148f669c93..e193d2d91943 100644 --- a/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/pom.xml b/features/user-mgt/pom.xml index 56f39e02e80e..514152682809 100644 --- a/features/user-mgt/pom.xml +++ b/features/user-mgt/pom.xml @@ -17,7 +17,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml b/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml index 26c428105459..66da4b60805a 100644 --- a/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml +++ b/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework user-store-feature - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/features/user-store/pom.xml b/features/user-store/pom.xml index 2dcc2a99843d..e1d87613ad82 100644 --- a/features/user-store/pom.xml +++ b/features/user-store/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index a6277bf6b4de..312d66e4ba8e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework pom - 7.7.34 + 7.7.35-SNAPSHOT WSO2 Carbon - Platform Aggregator Pom http://wso2.org @@ -36,7 +36,7 @@ https://github.com/wso2/carbon-identity-framework.git scm:git:https://github.com/wso2/carbon-identity-framework.git scm:git:https://github.com/wso2/carbon-identity-framework.git - v7.7.34 + HEAD diff --git a/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml index 7e1332b95c58..3f98eb189fe0 100644 --- a/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml index 97e82d904e64..cbc1fa7e79e6 100644 --- a/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml index b9de2cdd36fd..2ee42da4f7bc 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml 4.0.0 diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml index 447b8a96eb29..01423cdfe3f3 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml index 9013c963a39b..e43e4ebf4dd2 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml index d2df06099f43..3c84b245da43 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml index 6e059bd3dac6..e94accb14567 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml @@ -21,7 +21,7 @@ carbon-service-stubs org.wso2.carbon.identity.framework - 7.7.34 + 7.7.35-SNAPSHOT 4.0.0 diff --git a/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml index d07d6deeaa08..df1178eb2661 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml index 4f72b9a8e713..50288693bf1c 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml index e6b98f3982db..6a8cbf4391b8 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml index 5a43abb9e565..e3839279f922 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml index 37612d162f07..c7ec52f0038b 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml index 2df8c7575a72..62cc1e8ca34a 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml index f3df974e2b3c..8ca4d034283f 100644 --- a/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml index 1d7fb3fdf636..124fdca90954 100644 --- a/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml index e0a7354b0f79..dcc94bea23a2 100644 --- a/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.7.34 + 7.7.35-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/pom.xml b/service-stubs/identity/pom.xml index 4ed741d7d730..d35130de3a6d 100644 --- a/service-stubs/identity/pom.xml +++ b/service-stubs/identity/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.testutil/pom.xml b/test-utils/org.wso2.carbon.identity.testutil/pom.xml index a05dee9e7663..4a303eab5463 100644 --- a/test-utils/org.wso2.carbon.identity.testutil/pom.xml +++ b/test-utils/org.wso2.carbon.identity.testutil/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.7.34 + 7.7.35-SNAPSHOT ../../pom.xml From 189176f6b6840a200b6aceec87902df67f0f7df0 Mon Sep 17 00:00:00 2001 From: malithie Date: Fri, 13 Dec 2024 01:37:20 +0530 Subject: [PATCH 06/20] Update version to reflect master branch version. --- .../rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml index 8ccd6c3efbd1..c46de3655c09 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework rule-mgt - 7.7.34-SNAPSHOT + 7.7.35-SNAPSHOT ../pom.xml From 2c9c18040fc7bb6420daf540bcea11a4b09524ac Mon Sep 17 00:00:00 2001 From: malithie Date: Sun, 15 Dec 2024 16:36:50 +0530 Subject: [PATCH 07/20] Fix to use int id as primary key. --- .../pom.xml | 4 + .../management/constant/RuleSQLConstants.java | 15 +- .../management/dao/RuleManagementDAO.java | 20 ++- .../dao/impl/RuleManagementDAOImpl.java | 169 +++++++++++------- .../management/model/internal/RuleData.java | 49 +++++ .../impl/RuleManagementServiceImpl.java | 5 + .../src/test/resources/dbscripts/h2.sql | 8 +- pom.xml | 2 +- 8 files changed, 187 insertions(+), 85 deletions(-) create mode 100644 components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/RuleData.java diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml index c46de3655c09..d44e2f60c142 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml @@ -39,6 +39,10 @@ org.wso2.carbon.identity.framework org.wso2.carbon.identity.core + + org.wso2.carbon.utils + org.wso2.carbon.database.utils + org.wso2.carbon.identity.framework org.wso2.carbon.identity.central.log.mgt diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java index 3b725665f93b..9a224353114f 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java @@ -33,14 +33,14 @@ private RuleSQLConstants() { */ public static class Column { - public static final String UUID = "UUID"; + public static final String RULE_INTERNAL_ID = "ID"; + public static final String RULE_EXTERNAL_ID = "UUID"; public static final String RULE = "RULE"; public static final String IS_ACTIVE = "IS_ACTIVE"; public static final String TENANT_ID = "TENANT_ID"; - public static final String RULE_REFERENCE_UUID = "RULE_UUID"; + public static final String RULE_REFERENCE_ID = "RULE_ID"; public static final String FIELD_NAME = "FIELD_NAME"; public static final String FIELD_REFERENCE = "FIELD_REFERENCE"; - public static final int RULE_INDEX = 2; private Column() { @@ -54,19 +54,22 @@ public static class Query { public static final String ADD_RULE = "INSERT INTO IDN_RULE (UUID, RULE, IS_ACTIVE, TENANT_ID) " + "VALUES (:UUID;, :RULE;, :IS_ACTIVE;, :TENANT_ID;)"; - public static final String ADD_RULE_REFERENCES = "INSERT INTO IDN_RULE_REFERENCES (RULE_UUID, " + - "FIELD_NAME, FIELD_REFERENCE, TENANT_ID) VALUES (:RULE_UUID;, :FIELD_NAME;, :FIELD_REFERENCE;, " + + public static final String ADD_RULE_REFERENCES = "INSERT INTO IDN_RULE_REFERENCES (RULE_ID, " + + "FIELD_NAME, FIELD_REFERENCE, TENANT_ID) VALUES (:RULE_ID;, :FIELD_NAME;, :FIELD_REFERENCE;, " + ":TENANT_ID;)"; public static final String UPDATE_RULE = "UPDATE IDN_RULE SET RULE = :RULE; WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; public static final String DELETE_RULE_REFERENCES = - "DELETE FROM IDN_RULE_REFERENCES WHERE RULE_UUID = :RULE_UUID; AND TENANT_ID = :TENANT_ID;"; + "DELETE FROM IDN_RULE_REFERENCES WHERE RULE_ID = :RULE_ID; AND TENANT_ID = :TENANT_ID;"; public static final String DELETE_RULE = "DELETE FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; public static final String CHANGE_RULE_STATUS = "UPDATE IDN_RULE SET IS_ACTIVE = :IS_ACTIVE; WHERE UUID = " + ":UUID; AND TENANT_ID = :TENANT_ID;"; public static final String GET_RULE_BY_ID = "SELECT RULE, IS_ACTIVE FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; + public static final String GET_RULE_INTERNAL_ID_BY_ID = + "SELECT ID FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; + private Query() { } diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java index f72ec5602daf..ab8304d55c56 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java @@ -21,6 +21,8 @@ import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; import org.wso2.carbon.identity.rule.management.model.Rule; +import java.sql.SQLException; + /** * Rule Management DAO. * This class is used to perform CRUD operations on Rule in the datastore. @@ -29,7 +31,8 @@ public interface RuleManagementDAO { /** * Add a new Rule. - * @param rule Rule object + * + * @param rule Rule object * @param tenantId Tenant ID * @throws RuleManagementException Rule Management Exception */ @@ -37,7 +40,8 @@ public interface RuleManagementDAO { /** * Update an existing Rule. - * @param rule Rule object + * + * @param rule Rule object * @param tenantId Tenant ID * @throws RuleManagementException Rule Management Exception */ @@ -45,7 +49,8 @@ public interface RuleManagementDAO { /** * Delete a Rule. - * @param ruleId Rule ID + * + * @param ruleId Rule ID * @param tenantId Tenant ID * @throws RuleManagementException Rule Management Exception */ @@ -53,7 +58,8 @@ public interface RuleManagementDAO { /** * Get a Rule by Rule ID. - * @param ruleId Rule ID + * + * @param ruleId Rule ID * @param tenantId Tenant ID * @return Rule object * @throws RuleManagementException Rule Management Exception @@ -62,7 +68,8 @@ public interface RuleManagementDAO { /** * Activate a Rule. - * @param ruleId Rule ID + * + * @param ruleId Rule ID * @param tenantId Tenant ID * @throws RuleManagementException Rule Management Exception */ @@ -70,7 +77,8 @@ public interface RuleManagementDAO { /** * Deactivate a Rule. - * @param ruleId Rule ID + * + * @param ruleId Rule ID * @param tenantId Tenant ID * @throws RuleManagementException Rule Management Exception */ diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java index 3b9b1122ff4f..e272361b006f 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java @@ -33,10 +33,13 @@ import org.wso2.carbon.identity.rule.management.model.Value; import org.wso2.carbon.identity.rule.management.model.internal.ANDCombinedRule; import org.wso2.carbon.identity.rule.management.model.internal.ORCombinedRule; +import org.wso2.carbon.identity.rule.management.model.internal.RuleData; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; +import java.util.concurrent.atomic.AtomicInteger; /** * Rule Management DAO Implementation. @@ -55,9 +58,9 @@ public class RuleManagementDAOImpl implements RuleManagementDAO { public void addRule(Rule rule, int tenantId) throws RuleManagementException { try { - addRuleToDB(rule, tenantId); - addRuleValueReferencesToDB(rule, tenantId); - } catch (TransactionException e) { + int internalId = addRuleToDB(rule, tenantId); + addRuleValueReferencesToDB(internalId, rule, tenantId); + } catch (TransactionException | IOException | DataAccessException e) { throw new RuleManagementServerException("Error while creating the rule in the system.", e); } } @@ -73,11 +76,16 @@ public void addRule(Rule rule, int tenantId) throws RuleManagementException { @Override public void updateRule(Rule rule, int tenantId) throws RuleManagementException { + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); try { - updateRuleInDB(rule, tenantId); - deleteRuleReferencesInDB(rule, tenantId); - addRuleValueReferencesToDB(rule, tenantId); - } catch (DataAccessException | TransactionException e) { + jdbcTemplate.withTransaction(template -> { + updateRuleInDB(rule, tenantId); + int internalRuleId = getInternalRuleIdByRuleId(rule.getId(), tenantId); + deleteRuleReferencesInDB(internalRuleId, tenantId); + addRuleValueReferencesToDB(internalRuleId, rule, tenantId); + return null; + }); + } catch (TransactionException e) { throw new RuleManagementServerException("Error while updating the rule in the system.", e); } } @@ -97,7 +105,7 @@ public void deleteRule(String ruleId, int tenantId) throws RuleManagementExcepti jdbcTemplate.withTransaction(template -> { template.executeUpdate(RuleSQLConstants.Query.DELETE_RULE, statement -> { - statement.setString(RuleSQLConstants.Column.UUID, ruleId); + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); }); @@ -121,26 +129,25 @@ public Rule getRuleByRuleId(String ruleId, int tenantId) throws RuleManagementEx NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); try { - String[] ruleJson = new String[1]; - boolean[] isActive = new boolean[1]; + RuleData ruleData = new RuleData(); jdbcTemplate.fetchSingleRecord(RuleSQLConstants.Query.GET_RULE_BY_ID, (resultSet, rowNumber) -> { - ruleJson[0] = resultSet.getString(RuleSQLConstants.Column.RULE); - isActive[0] = resultSet.getBoolean(RuleSQLConstants.Column.IS_ACTIVE); + ruleData.setRuleJson(resultSet.getString(RuleSQLConstants.Column.RULE)); + ruleData.setActive(resultSet.getBoolean(RuleSQLConstants.Column.IS_ACTIVE)); return null; }, statement -> { - statement.setString(RuleSQLConstants.Column.UUID, ruleId); + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); }); - if (ruleJson[0] == null) { + if (ruleData.getRuleJson() == null) { return null; } - return new ORCombinedRule.Builder(convertJsonToRule(ruleJson[0])) + return new ORCombinedRule.Builder(convertJsonToRule(ruleData.getRuleJson())) .setId(ruleId) - .setActive(isActive[0]) + .setActive(ruleData.isActive()) .build(); } catch (DataAccessException e) { throw new RuleManagementServerException("Error while retrieving the rule from the system.", e); @@ -159,14 +166,17 @@ public void activateRule(String ruleId, int tenantId) throws RuleManagementExcep NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); try { - jdbcTemplate.executeUpdate(RuleSQLConstants.Query.CHANGE_RULE_STATUS, - statement -> { - statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, true); - statement.setString(RuleSQLConstants.Column.UUID, ruleId); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - }); - } catch (DataAccessException e) { - throw new RuleManagementServerException("Error while deactivating the rule in the system.", e); + jdbcTemplate.withTransaction(template -> { + jdbcTemplate.executeUpdate(RuleSQLConstants.Query.CHANGE_RULE_STATUS, + statement -> { + statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, true); + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + return null; + }); + } catch (TransactionException e) { + throw new RuleManagementServerException("Error while activating the rule in the system.", e); } } @@ -182,82 +192,103 @@ public void deactivateRule(String ruleId, int tenantId) throws RuleManagementExc NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); try { - jdbcTemplate.executeUpdate(RuleSQLConstants.Query.CHANGE_RULE_STATUS, - statement -> { - statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, false); - statement.setString(RuleSQLConstants.Column.UUID, ruleId); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - }); - } catch (DataAccessException e) { + jdbcTemplate.withTransaction(template -> { + jdbcTemplate.executeUpdate(RuleSQLConstants.Query.CHANGE_RULE_STATUS, + statement -> { + statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, false); + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + return null; + }); + } catch (TransactionException e) { throw new RuleManagementServerException("Error while deactivating the rule in the system.", e); } } - private void addRuleToDB(Rule rule, int tenantId) throws TransactionException, RuleManagementServerException { + private int addRuleToDB(Rule rule, int tenantId) + throws TransactionException, IOException, RuleManagementServerException { - InputStream ruleJson = convertRuleToJson(rule); + InputStream ruleJsonAsInputStream = convertRuleToJson(rule); + int ruleJsonStreamLength = ruleJsonAsInputStream.available(); NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + AtomicInteger internalId = new AtomicInteger(); jdbcTemplate.withTransaction(template -> { - template.executeInsert(RuleSQLConstants.Query.ADD_RULE, + internalId.set(template.executeInsert(RuleSQLConstants.Query.ADD_RULE, statement -> { - statement.setString(RuleSQLConstants.Column.UUID, rule.getId()); - statement.setBlob(RuleSQLConstants.Column.RULE_INDEX, ruleJson); + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, rule.getId()); + statement.setBinaryStream(RuleSQLConstants.Column.RULE, ruleJsonAsInputStream, + ruleJsonStreamLength); statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, rule.isActive()); statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - }, rule, false); + }, rule, true)); return null; }); + + return internalId.get(); } - private void addRuleValueReferencesToDB(Rule rule, int tenantId) throws TransactionException { + private int getInternalRuleIdByRuleId(String ruleId, int tenantId) throws RuleManagementException { - ORCombinedRule orCombinedRule = (ORCombinedRule) rule; NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); - jdbcTemplate.withTransaction(template -> { - template.executeBatchInsert(RuleSQLConstants.Query.ADD_RULE_REFERENCES, + try { + return jdbcTemplate.fetchSingleRecord(RuleSQLConstants.Query.GET_RULE_INTERNAL_ID_BY_ID, + (resultSet, rowNumber) -> { + return resultSet.getInt(RuleSQLConstants.Column.RULE_INTERNAL_ID); + }, statement -> { - for (ANDCombinedRule rule1 : orCombinedRule.getRules()) { - for (Expression expression : rule1.getExpressions()) { - if (expression.getValue().getType() == Value.Type.REFERENCE) { - statement.setString(RuleSQLConstants.Column.RULE_REFERENCE_UUID, rule.getId()); - statement.setString(RuleSQLConstants.Column.FIELD_NAME, expression.getField()); - statement.setString(RuleSQLConstants.Column.FIELD_REFERENCE, - expression.getValue().getFieldValue()); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - statement.addBatch(); - } + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + } catch (DataAccessException e) { + throw new RuleManagementServerException("Error while retrieving the rule from the system.", e); + } + } + + private void addRuleValueReferencesToDB(int internalRuleId, Rule rule, int tenantId) throws DataAccessException { + + ORCombinedRule orCombinedRule = (ORCombinedRule) rule; + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + jdbcTemplate.executeBatchInsert(RuleSQLConstants.Query.ADD_RULE_REFERENCES, + statement -> { + for (ANDCombinedRule rule1 : orCombinedRule.getRules()) { + for (Expression expression : rule1.getExpressions()) { + if (expression.getValue().getType() == Value.Type.REFERENCE) { + statement.setInt(RuleSQLConstants.Column.RULE_REFERENCE_ID, internalRuleId); + statement.setString(RuleSQLConstants.Column.FIELD_NAME, expression.getField()); + statement.setString(RuleSQLConstants.Column.FIELD_REFERENCE, + expression.getValue().getFieldValue()); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + statement.addBatch(); } } - }, null); - return null; - }); + } + }, null); } - private void updateRuleInDB(Rule rule, int tenantId) throws DataAccessException, RuleManagementServerException { + private void updateRuleInDB(Rule rule, int tenantId) + throws DataAccessException, IOException, RuleManagementServerException { - InputStream ruleJson = convertRuleToJson(rule); + InputStream ruleJsonAsInputStream = convertRuleToJson(rule); + int ruleJsonStreamLength = ruleJsonAsInputStream.available(); NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); jdbcTemplate.executeUpdate(RuleSQLConstants.Query.UPDATE_RULE, statement -> { - statement.setBlob(1, ruleJson); - statement.setString(RuleSQLConstants.Column.UUID, rule.getId()); + statement.setBinaryStream(RuleSQLConstants.Column.RULE, ruleJsonAsInputStream, + ruleJsonStreamLength); + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, rule.getId()); statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); }); } - private void deleteRuleReferencesInDB(Rule rule, int tenantId) - throws TransactionException { + private void deleteRuleReferencesInDB(int internalRuleId, int tenantId) throws DataAccessException { NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); - jdbcTemplate.withTransaction(template -> { - template.executeUpdate(RuleSQLConstants.Query.DELETE_RULE_REFERENCES, - statement -> { - statement.setString(RuleSQLConstants.Column.RULE_REFERENCE_UUID, rule.getId()); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - }); - - return null; - }); + jdbcTemplate.executeUpdate(RuleSQLConstants.Query.DELETE_RULE_REFERENCES, + statement -> { + statement.setInt(RuleSQLConstants.Column.RULE_REFERENCE_ID, internalRuleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); } private InputStream convertRuleToJson(Rule rule) throws RuleManagementServerException { diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/RuleData.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/RuleData.java new file mode 100644 index 000000000000..f3e592259c72 --- /dev/null +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/model/internal/RuleData.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 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 + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.rule.management.model.internal; + +/** + * Represents a rule in the data layer. + * This class has the rule JSON and the active status of the rule which is stored in the database. + */ +public class RuleData { + + private String ruleJson; + private boolean isActive; + + public String getRuleJson() { + + return ruleJson; + } + + public void setRuleJson(String ruleJson) { + + this.ruleJson = ruleJson; + } + + public boolean isActive() { + + return isActive; + } + + public void setActive(boolean active) { + + isActive = active; + } +} diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/impl/RuleManagementServiceImpl.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/impl/RuleManagementServiceImpl.java index f3a82db6906a..f60a40d38356 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/impl/RuleManagementServiceImpl.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/service/impl/RuleManagementServiceImpl.java @@ -51,6 +51,7 @@ public static RuleManagementServiceImpl getInstance() { * @param rule Rule to be added. * @param tenantDomain Tenant domain. * @return Added rule. + * @throws RuleManagementException If an error occurs while adding the rule. */ @Override public Rule addRule(Rule rule, String tenantDomain) throws RuleManagementException { @@ -66,6 +67,7 @@ public Rule addRule(Rule rule, String tenantDomain) throws RuleManagementExcepti * @param rule Rule to be updated. * @param tenantDomain Tenant domain. * @return Updated rule. + * @throws RuleManagementException If an error occurs while updating the rule. */ @Override public Rule updateRule(Rule rule, String tenantDomain) throws RuleManagementException { @@ -81,6 +83,7 @@ public Rule updateRule(Rule rule, String tenantDomain) throws RuleManagementExce * * @param ruleId Rule ID. * @param tenantDomain Tenant domain. + * @throws RuleManagementException If an error occurs while deleting the rule. */ @Override public void deleteRule(String ruleId, String tenantDomain) throws RuleManagementException { @@ -96,6 +99,7 @@ public void deleteRule(String ruleId, String tenantDomain) throws RuleManagement * @param ruleId Rule ID. * @param tenantDomain Tenant domain. * @return Rule. + * @throws RuleManagementException If an error occurs while retrieving the rule. */ @Override public Rule getRuleByRuleId(String ruleId, String tenantDomain) throws RuleManagementException { @@ -109,6 +113,7 @@ public Rule getRuleByRuleId(String ruleId, String tenantDomain) throws RuleManag * @param ruleId Rule ID. * @param tenantDomain Tenant domain. * @return Deactivated rule. + * @throws RuleManagementException If an error occurs while deactivating the rule. */ @Override public Rule deactivateRule(String ruleId, String tenantDomain) throws RuleManagementException { diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql index 4bf9a5334b30..e2d1e98a2f1b 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql @@ -1,17 +1,19 @@ CREATE TABLE IF NOT EXISTS IDN_RULE ( + ID INTEGER NOT NULL AUTO_INCREMENT, UUID CHAR(36) NOT NULL, RULE BLOB NOT NULL, IS_ACTIVE BOOLEAN DEFAULT TRUE, TENANT_ID INTEGER NOT NULL, - PRIMARY KEY (UUID) + PRIMARY KEY (ID), + UNIQUE (UUID) ); CREATE TABLE IF NOT EXISTS IDN_RULE_REFERENCES ( ID INTEGER NOT NULL AUTO_INCREMENT, - RULE_UUID CHAR(36) NOT NULL, + RULE_ID INTEGER NOT NULL, FIELD_NAME VARCHAR(100) NOT NULL, FIELD_REFERENCE VARCHAR(255) NOT NULL, TENANT_ID INTEGER NOT NULL, PRIMARY KEY (ID), - FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE + FOREIGN KEY (RULE_ID) REFERENCES IDN_RULE(ID) ON DELETE CASCADE ); diff --git a/pom.xml b/pom.xml index 312d66e4ba8e..9ef6aa3f5c8c 100644 --- a/pom.xml +++ b/pom.xml @@ -1848,7 +1848,7 @@ 4.7.39 [4.7.2, 5.0.0) - 2.1.7 + 2.2.2 [2.0.0,3.0.0) From 5577799f214df0b80d6793a155aee7a24c603baf Mon Sep 17 00:00:00 2001 From: malithie Date: Sun, 15 Dec 2024 16:53:53 +0530 Subject: [PATCH 08/20] Fix to use int id as primary key. --- .../rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml | 2 +- .../identity/rule/management/constant/RuleSQLConstants.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml index d44e2f60c142..cb99b2a9d4e7 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework rule-mgt - 7.7.35-SNAPSHOT + 7.7.38-SNAPSHOT ../pom.xml diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java index 9a224353114f..749b372eb8c6 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java @@ -66,7 +66,6 @@ public static class Query { ":UUID; AND TENANT_ID = :TENANT_ID;"; public static final String GET_RULE_BY_ID = "SELECT RULE, IS_ACTIVE FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; - public static final String GET_RULE_INTERNAL_ID_BY_ID = "SELECT ID FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; From 07409db6b6156d25822311c6a15f394b2e4782e4 Mon Sep 17 00:00:00 2001 From: malithie Date: Sun, 15 Dec 2024 16:59:46 +0530 Subject: [PATCH 09/20] Add exception to dao doc comment. --- .../management/dao/impl/CacheBackedRuleManagementDAO.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java index 4eea5250544d..1d722b034392 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java @@ -51,6 +51,7 @@ public CacheBackedRuleManagementDAO(RuleManagementDAO ruleManagementDAO) { * * @param rule Rule object * @param tenantId Tenant ID + * @throws RuleManagementException Rule Management Exception */ @Override public void addRule(Rule rule, int tenantId) throws RuleManagementException { @@ -64,6 +65,7 @@ public void addRule(Rule rule, int tenantId) throws RuleManagementException { * * @param rule Rule object * @param tenantId Tenant ID + * @throws RuleManagementException Rule Management Exception */ @Override public void updateRule(Rule rule, int tenantId) throws RuleManagementException { @@ -79,6 +81,7 @@ public void updateRule(Rule rule, int tenantId) throws RuleManagementException { * * @param ruleId Rule ID * @param tenantId Tenant ID + * @throws RuleManagementException Rule Management Exception */ @Override public void deleteRule(String ruleId, int tenantId) throws RuleManagementException { @@ -96,6 +99,7 @@ public void deleteRule(String ruleId, int tenantId) throws RuleManagementExcepti * @param ruleId Rule ID * @param tenantId Tenant ID * @return Rule object + * @throws RuleManagementException Rule Management Exception */ @Override public Rule getRuleByRuleId(String ruleId, int tenantId) throws RuleManagementException { @@ -120,6 +124,7 @@ public Rule getRuleByRuleId(String ruleId, int tenantId) throws RuleManagementEx * * @param ruleId Rule ID * @param tenantId Tenant ID + * @throws RuleManagementException Rule Management Exception */ @Override public void activateRule(String ruleId, int tenantId) throws RuleManagementException { @@ -135,6 +140,7 @@ public void activateRule(String ruleId, int tenantId) throws RuleManagementExcep * * @param ruleId Rule ID * @param tenantId Tenant ID + * @throws RuleManagementException Rule Management Exception */ @Override public void deactivateRule(String ruleId, int tenantId) throws RuleManagementException { From 92de26815dd7f149f48d778e063b54402712d255 Mon Sep 17 00:00:00 2001 From: malithie Date: Sun, 15 Dec 2024 18:11:35 +0530 Subject: [PATCH 10/20] Add version to the rule data layer. --- .../identity/rule/management/constant/RuleSQLConstants.java | 3 ++- .../rule/management/dao/impl/RuleManagementDAOImpl.java | 3 +++ .../src/test/resources/dbscripts/h2.sql | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java index 749b372eb8c6..8287e1e83bfc 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java @@ -38,6 +38,7 @@ public static class Column { public static final String RULE = "RULE"; public static final String IS_ACTIVE = "IS_ACTIVE"; public static final String TENANT_ID = "TENANT_ID"; + public static final String VERSION = "VERSION"; public static final String RULE_REFERENCE_ID = "RULE_ID"; public static final String FIELD_NAME = "FIELD_NAME"; public static final String FIELD_REFERENCE = "FIELD_REFERENCE"; @@ -53,7 +54,7 @@ private Column() { public static class Query { public static final String ADD_RULE = "INSERT INTO IDN_RULE (UUID, RULE, IS_ACTIVE, TENANT_ID) " + - "VALUES (:UUID;, :RULE;, :IS_ACTIVE;, :TENANT_ID;)"; + "VALUES (:UUID;, :RULE;, :IS_ACTIVE;, :TENANT_ID; :VERSION;)"; public static final String ADD_RULE_REFERENCES = "INSERT INTO IDN_RULE_REFERENCES (RULE_ID, " + "FIELD_NAME, FIELD_REFERENCE, TENANT_ID) VALUES (:RULE_ID;, :FIELD_NAME;, :FIELD_REFERENCE;, " + ":TENANT_ID;)"; diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java index e272361b006f..317fad843374 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java @@ -47,6 +47,8 @@ */ public class RuleManagementDAOImpl implements RuleManagementDAO { + private static final String V1 = "1.0.0"; + /** * This method will add the Rule to the database and add the Rule Value References to the database. * @@ -221,6 +223,7 @@ private int addRuleToDB(Rule rule, int tenantId) ruleJsonStreamLength); statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, rule.isActive()); statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + statement.setString(RuleSQLConstants.Column.VERSION, V1); }, rule, true)); return null; }); diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql index e2d1e98a2f1b..9d743720928e 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql @@ -4,6 +4,7 @@ CREATE TABLE IF NOT EXISTS IDN_RULE ( RULE BLOB NOT NULL, IS_ACTIVE BOOLEAN DEFAULT TRUE, TENANT_ID INTEGER NOT NULL, + VERSION VARCHAR(15) NOT NULL, PRIMARY KEY (ID), UNIQUE (UUID) ); From 0d7b08590f66bd8ab7cf3d9293d10ddb437adcd0 Mon Sep 17 00:00:00 2001 From: malithie Date: Sun, 15 Dec 2024 18:51:16 +0530 Subject: [PATCH 11/20] Update db schemas with version and int id. --- .../resources/dbscripts/db2.sql | 27 ++++++++++----- .../resources/dbscripts/h2.sql | 27 ++++++++------- .../resources/dbscripts/mssql.sql | 19 ++++++----- .../resources/dbscripts/mysql-cluster.sql | 19 ++++++----- .../resources/dbscripts/mysql.sql | 19 ++++++----- .../resources/dbscripts/oracle.sql | 28 ++++++++++----- .../resources/dbscripts/oracle_rac.sql | 34 +++++++++++++++---- .../resources/dbscripts/postgresql.sql | 24 +++++++++---- 8 files changed, 131 insertions(+), 66 deletions(-) diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql index ef7c882862a6..c5eaf32a2c95 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql @@ -2120,21 +2120,32 @@ REFERENCING NEW AS NEW FOR EACH ROW MODE DB2SQL END / CREATE TABLE IDN_RULE ( - UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, - IS_ACTIVE BOOLEAN DEFAULT TRUE, - TENANT_ID INTEGER NOT NULL, - PRIMARY KEY (UUID) + ID INTEGER NOT NULL, + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + VERSION VARCHAR(15) NOT NULL, + PRIMARY KEY (ID), + UNIQUE (UUID) ) / +CREATE SEQUENCE IDN_RULE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE +/ +CREATE TRIGGER IDN_RULE_TRIG NO CASCADE BEFORE INSERT ON IDN_RULE_REFERENCES +REFERENCING NEW AS NEW FOR EACH ROW MODE DB2SQL + BEGIN ATOMIC + SET (NEW.ID) = (NEXTVAL FOR IDN_RULE_SEQ); + END +/ CREATE TABLE IDN_RULE_REFERENCES ( ID INTEGER NOT NULL, - RULE_UUID CHAR(36) NOT NULL, + RULE_ID INTEGER NOT NULL, FIELD_NAME VARCHAR(100) NOT NULL, FIELD_REFERENCE VARCHAR(255) NOT NULL, TENANT_ID INTEGER NOT NULL, PRIMARY KEY (ID), - FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE + FOREIGN KEY (RULE_ID) REFERENCES IDN_RULE(ID) ON DELETE CASCADE ) / CREATE SEQUENCE IDN_RULE_REFERENCES_SEQ START WITH 1 INCREMENT BY 1 NOCACHE @@ -2314,7 +2325,7 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID) -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID) / -CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID) +CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID) / CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID) / diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql index eee6e2f71631..4bd3d9602960 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql @@ -1390,21 +1390,24 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_TOKEN_CLAIMS ( ); CREATE TABLE IF NOT EXISTS IDN_RULE ( - UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, - IS_ACTIVE BOOLEAN DEFAULT TRUE, - TENANT_ID INTEGER NOT NULL, - PRIMARY KEY (UUID) + ID INTEGER NOT NULL AUTO_INCREMENT, + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + VERSION VARCHAR(15) NOT NULL, + PRIMARY KEY (ID), + UNIQUE (UUID) ); CREATE TABLE IF NOT EXISTS IDN_RULE_REFERENCES ( ID INTEGER NOT NULL AUTO_INCREMENT, - RULE_UUID CHAR(36) NOT NULL, - FIELD_NAME VARCHAR(100) NOT NULL, - FIELD_REFERENCE VARCHAR(255) NOT NULL, - TENANT_ID INTEGER NOT NULL, - PRIMARY KEY (ID), - FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE + RULE_ID INTEGER NOT NULL, + FIELD_NAME VARCHAR(100) NOT NULL, + FIELD_REFERENCE VARCHAR(255) NOT NULL, + TENANT_ID INTEGER NOT NULL, + PRIMARY KEY (ID), + FOREIGN KEY (RULE_ID) REFERENCES IDN_RULE(ID) ON DELETE CASCADE ); -- --------------------------- INDEX CREATION ----------------------------- @@ -1522,5 +1525,5 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); -CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID); CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql index 94527a1d46b4..6005467e137f 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql @@ -1541,22 +1541,25 @@ CREATE TABLE IDN_OAUTH2_TOKEN_CLAIMS ( IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_RULE]') AND TYPE IN (N'U')) CREATE TABLE IDN_RULE ( - UUID CHAR(36) NOT NULL, - RULE VARBINARY(MAX) NOT NULL, - IS_ACTIVE BIT DEFAULT 1, - TENANT_ID INTEGER NOT NULL, - PRIMARY KEY (UUID) + ID INTEGER IDENTITY, + UUID CHAR(36) NOT NULL, + RULE VARBINARY(MAX) NOT NULL, + IS_ACTIVE BIT DEFAULT 1, + TENANT_ID INTEGER NOT NULL, + VERSION VARCHAR(15) NOT NULL, + PRIMARY KEY (ID), + UNIQUE (UUID) ); IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_RULE_REFERENCES]') AND TYPE IN (N'U')) CREATE TABLE IDN_RULE_REFERENCES ( ID INTEGER IDENTITY, - RULE_UUID CHAR(36) NOT NULL, + RULE_ID INTEGER NOT NULL, FIELD_NAME VARCHAR(100) NOT NULL, FIELD_REFERENCE VARCHAR(255) NOT NULL, TENANT_ID INTEGER NOT NULL, PRIMARY KEY (ID), - FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE + FOREIGN KEY (RULE_ID) REFERENCES IDN_RULE(ID) ON DELETE CASCADE ); -- --------------------------- INDEX CREATION ----------------------------- @@ -1675,7 +1678,7 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); -CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID); CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); GO diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql index 5c1de755da74..4283d3e649ac 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql @@ -1553,21 +1553,24 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_TOKEN_CLAIMS ( )ENGINE NDB; CREATE TABLE IF NOT EXISTS IDN_RULE ( - UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, - IS_ACTIVE BOOLEAN DEFAULT TRUE, - TENANT_ID INTEGER NOT NULL, - PRIMARY KEY (UUID) + ID INTEGER AUTO_INCREMENT, + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + VERSION VARCHAR(15) NOT NULL, + PRIMARY KEY (ID), + UNIQUE (UUID) )ENGINE NDB; CREATE TABLE IF NOT EXISTS IDN_RULE_REFERENCES ( ID INTEGER AUTO_INCREMENT, - RULE_UUID CHAR(36) NOT NULL, + RULE_ID INTEGER NOT NULL, FIELD_NAME VARCHAR(100) NOT NULL, FIELD_REFERENCE VARCHAR(255) NOT NULL, TENANT_ID INTEGER NOT NULL, PRIMARY KEY (ID), - FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE + FOREIGN KEY (RULE_ID) REFERENCES IDN_RULE(ID) ON DELETE CASCADE )ENGINE NDB; -- --------------------------- INDEX CREATION ----------------------------- @@ -1714,5 +1717,5 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); -CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID); CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql index a28e84f6be43..d15071109071 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql @@ -1421,21 +1421,24 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_TOKEN_CLAIMS ( )DEFAULT CHARACTER SET latin1 ENGINE INNODB; CREATE TABLE IF NOT EXISTS IDN_RULE ( - UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, - IS_ACTIVE BOOLEAN DEFAULT TRUE, - TENANT_ID INTEGER NOT NULL, - PRIMARY KEY (UUID) + ID INTEGER AUTO_INCREMENT, + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + VERSION VARCHAR(15) NOT NULL, + PRIMARY KEY (ID), + UNIQUE (UUID) )DEFAULT CHARACTER SET latin1 ENGINE INNODB; CREATE TABLE IF NOT EXISTS IDN_RULE_REFERENCES ( ID INTEGER AUTO_INCREMENT, - RULE_UUID CHAR(36) NOT NULL, + RULE_ID INTEGER NOT NULL, FIELD_NAME VARCHAR(100) NOT NULL, FIELD_REFERENCE VARCHAR(255) NOT NULL, TENANT_ID INTEGER NOT NULL, PRIMARY KEY (ID), - FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE + FOREIGN KEY (RULE_ID) REFERENCES IDN_RULE(ID) ON DELETE CASCADE )DEFAULT CHARACTER SET latin1 ENGINE INNODB; -- --------------------------- INDEX CREATION ----------------------------- @@ -1550,5 +1553,5 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); -CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID); CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql index 3ce59153b486..349f97ea198c 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql @@ -2185,21 +2185,33 @@ CREATE OR REPLACE TRIGGER IDN_OAUTH2_TOKEN_CLAIMS_TRIG END; / CREATE TABLE IDN_RULE ( - UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, - IS_ACTIVE CHAR (1) DEFAULT '1', - TENANT_ID INTEGER NOT NULL, - PRIMARY KEY (UUID) + ID INTEGER, + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE CHAR (1) DEFAULT '1', + TENANT_ID INTEGER NOT NULL, + VERSION VARCHAR(15) NOT NULL, + PRIMARY KEY (ID), + UNIQUE (UUID) ) / +CREATE SEQUENCE IDN_RULE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE +/ +CREATE OR REPLACE TRIGGER IDN_RULE_TRIGGER + BEFORE INSERT ON IDN_RULE + REFERENCING NEW AS NEW FOR EACH ROW + BEGIN + SELECT IDN_RULE_SEQ.nextval INTO :NEW.ID FROM dual; + END; +/ CREATE TABLE IDN_RULE_REFERENCES ( ID INTEGER, - RULE_UUID CHAR(36) NOT NULL, + RULE_ID INTEGER NOT NULL, FIELD_NAME VARCHAR(100) NOT NULL, FIELD_REFERENCE VARCHAR(255) NOT NULL, TENANT_ID INTEGER NOT NULL, PRIMARY KEY (ID), - FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE + FOREIGN KEY (RULE_ID) REFERENCES IDN_RULE(ID) ON DELETE CASCADE ) / CREATE SEQUENCE IDN_RULE_REFERENCES_SEQ START WITH 1 INCREMENT BY 1 NOCACHE @@ -2372,7 +2384,7 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID) -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID) / -CREATE INDEX IDX_IDN_RULE_REF_RUUID_TID ON IDN_RULE_REFERENCES (RULE_UUID, TENANT_ID) +CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID) / CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID) / diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql index f37768077066..6a8a0b1d87a5 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql @@ -2118,21 +2118,33 @@ CREATE OR REPLACE TRIGGER IDN_OAUTH2_TOKEN_CLAIMS_TRIG END; / CREATE TABLE IDN_RULE ( - UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, - IS_ACTIVE CHAR (1) DEFAULT '1', - TENANT_ID INTEGER NOT NULL, - PRIMARY KEY (UUID) + ID INTEGER, + UUID CHAR(36) NOT NULL, + RULE BLOB NOT NULL, + IS_ACTIVE CHAR (1) DEFAULT '1', + TENANT_ID INTEGER NOT NULL, + VERSION VARCHAR(15) NOT NULL, + PRIMARY KEY (ID), + UNIQUE (UUID) ) / +CREATE SEQUENCE IDN_RULE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE +/ +CREATE OR REPLACE TRIGGER IDN_RULE_TRIGGER + BEFORE INSERT ON IDN_RULE + REFERENCING NEW AS NEW FOR EACH ROW + BEGIN + SELECT IDN_RULE_SEQ.nextval INTO :NEW.ID FROM dual; + END; +/ CREATE TABLE IDN_RULE_REFERENCES ( ID INTEGER, - RULE_UUID CHAR(36) NOT NULL, + RULE_ID INTEGER NOT NULL, FIELD_NAME VARCHAR(100) NOT NULL, FIELD_REFERENCE VARCHAR(255) NOT NULL, TENANT_ID INTEGER NOT NULL, PRIMARY KEY (ID), - FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE + FOREIGN KEY (RULE_ID) REFERENCES IDN_RULE(ID) ON DELETE CASCADE ) / CREATE SEQUENCE IDN_RULE_REFERENCES_SEQ START WITH 1 INCREMENT BY 1 NOCACHE @@ -2272,3 +2284,11 @@ CREATE INDEX IDX_IDN_CERTIFICATE_ID_TID ON IDN_CERTIFICATE (ID, TENANT_ID) / CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID) / + +-- RULES -- +CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID) +/ +CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID) +/ +CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID) +/ diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql index 98c60426ded6..00b43600a583 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql @@ -1662,12 +1662,17 @@ CREATE TABLE IDN_OAUTH2_TOKEN_CLAIMS ( ); DROP TABLE IF EXISTS IDN_RULE; +DROP SEQUENCE IF EXISTS IDN_RULE_SEQ; +CREATE SEQUENCE IDN_RULE_SEQ; CREATE TABLE IDN_RULE ( - UUID CHAR(36) NOT NULL, - RULE BYTEA NOT NULL, - IS_ACTIVE BOOLEAN DEFAULT TRUE, - TENANT_ID INTEGER NOT NULL, - PRIMARY KEY (UUID) + ID INTEGER NOT NULL DEFAULT NEXTVAL('IDN_RULE_SEQ'), + UUID CHAR(36) NOT NULL, + RULE BYTEA NOT NULL, + IS_ACTIVE BOOLEAN DEFAULT TRUE, + TENANT_ID INTEGER NOT NULL, + VERSION VARCHAR(15) NOT NULL, + PRIMARY KEY (ID) + UNIQUE (UUID) ); DROP TABLE IF EXISTS IDN_RULE_REFERENCES; @@ -1675,12 +1680,12 @@ DROP SEQUENCE IF EXISTS IDN_RULE_REFERENCES_SEQ; CREATE SEQUENCE IDN_RULE_REFERENCES_SEQ; CREATE TABLE IDN_RULE_REFERENCES ( ID INTEGER NOT NULL DEFAULT NEXTVAL('IDN_RULE_REFERENCES_SEQ'), - RULE_UUID CHAR(36) NOT NULL, + RULE_ID INTEGER NOT NULL, FIELD_NAME VARCHAR(100) NOT NULL, FIELD_REFERENCE VARCHAR(255) NOT NULL, TENANT_ID INTEGER NOT NULL, PRIMARY KEY (ID), - FOREIGN KEY (RULE_UUID) REFERENCES IDN_RULE(UUID) ON DELETE CASCADE + FOREIGN KEY (RULE_ID) REFERENCES IDN_RULE(ID) ON DELETE CASCADE ); -- --------------------------- INDEX CREATION ----------------------------- @@ -1798,3 +1803,8 @@ CREATE INDEX IDX_IDN_ACTION_ENDPOINT_AU_TI ON IDN_ACTION_ENDPOINT (ACTION_UUID, -- CERTIFICATE -- CREATE INDEX IDX_IDN_CERTIFICATE_ID_TID ON IDN_CERTIFICATE (ID, TENANT_ID); CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); + +-- RULES -- +CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID); +CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); From fb79fe73617acce88da41676892c592e769edebb Mon Sep 17 00:00:00 2001 From: malithie Date: Sun, 15 Dec 2024 19:30:45 +0530 Subject: [PATCH 12/20] Remove unused import. --- .../carbon/identity/rule/management/dao/RuleManagementDAO.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java index ab8304d55c56..ccb873e7504e 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/RuleManagementDAO.java @@ -21,8 +21,6 @@ import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; import org.wso2.carbon.identity.rule.management.model.Rule; -import java.sql.SQLException; - /** * Rule Management DAO. * This class is used to perform CRUD operations on Rule in the datastore. From a894553ba20319c2a932e02555e01de717283a85 Mon Sep 17 00:00:00 2001 From: malithie Date: Mon, 16 Dec 2024 12:25:29 +0530 Subject: [PATCH 13/20] Fix to use same connection with transactions. --- .../management/constant/RuleSQLConstants.java | 4 +- .../dao/impl/RuleManagementDAOImpl.java | 122 ++++++++++-------- 2 files changed, 69 insertions(+), 57 deletions(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java index 8287e1e83bfc..9181c07a6595 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java @@ -53,8 +53,8 @@ private Column() { */ public static class Query { - public static final String ADD_RULE = "INSERT INTO IDN_RULE (UUID, RULE, IS_ACTIVE, TENANT_ID) " + - "VALUES (:UUID;, :RULE;, :IS_ACTIVE;, :TENANT_ID; :VERSION;)"; + public static final String ADD_RULE = "INSERT INTO IDN_RULE (UUID, RULE, IS_ACTIVE, TENANT_ID, VERSION) " + + "VALUES (:UUID;, :RULE;, :IS_ACTIVE;, :TENANT_ID;, :VERSION;)"; public static final String ADD_RULE_REFERENCES = "INSERT INTO IDN_RULE_REFERENCES (RULE_ID, " + "FIELD_NAME, FIELD_REFERENCE, TENANT_ID) VALUES (:RULE_ID;, :FIELD_NAME;, :FIELD_REFERENCE;, " + ":TENANT_ID;)"; diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java index 317fad843374..a5ecd393d1c2 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.wso2.carbon.database.utils.jdbc.NamedJdbcTemplate; -import org.wso2.carbon.database.utils.jdbc.exceptions.DataAccessException; import org.wso2.carbon.database.utils.jdbc.exceptions.TransactionException; import org.wso2.carbon.identity.core.util.IdentityDatabaseUtil; import org.wso2.carbon.identity.rule.management.constant.RuleSQLConstants; @@ -59,10 +58,14 @@ public class RuleManagementDAOImpl implements RuleManagementDAO { @Override public void addRule(Rule rule, int tenantId) throws RuleManagementException { + NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); try { - int internalId = addRuleToDB(rule, tenantId); - addRuleValueReferencesToDB(internalId, rule, tenantId); - } catch (TransactionException | IOException | DataAccessException e) { + jdbcTemplate.withTransaction(template -> { + int internalId = addRuleToDB(rule, tenantId); + addRuleValueReferencesToDB(internalId, rule, tenantId); + return null; + }); + } catch (TransactionException e) { throw new RuleManagementServerException("Error while creating the rule in the system.", e); } } @@ -130,18 +133,19 @@ public void deleteRule(String ruleId, int tenantId) throws RuleManagementExcepti public Rule getRuleByRuleId(String ruleId, int tenantId) throws RuleManagementException { NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); + RuleData ruleData = new RuleData(); try { - RuleData ruleData = new RuleData(); - jdbcTemplate.fetchSingleRecord(RuleSQLConstants.Query.GET_RULE_BY_ID, - (resultSet, rowNumber) -> { - ruleData.setRuleJson(resultSet.getString(RuleSQLConstants.Column.RULE)); - ruleData.setActive(resultSet.getBoolean(RuleSQLConstants.Column.IS_ACTIVE)); - return null; - }, - statement -> { - statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - }); + jdbcTemplate.withTransaction( + template -> template.fetchSingleRecord(RuleSQLConstants.Query.GET_RULE_BY_ID, + (resultSet, rowNumber) -> { + ruleData.setRuleJson(resultSet.getString(RuleSQLConstants.Column.RULE)); + ruleData.setActive(resultSet.getBoolean(RuleSQLConstants.Column.IS_ACTIVE)); + return null; + }, + statement -> { + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + })); if (ruleData.getRuleJson() == null) { return null; @@ -151,7 +155,7 @@ public Rule getRuleByRuleId(String ruleId, int tenantId) throws RuleManagementEx .setId(ruleId) .setActive(ruleData.isActive()) .build(); - } catch (DataAccessException e) { + } catch (TransactionException e) { throw new RuleManagementServerException("Error while retrieving the rule from the system.", e); } } @@ -169,7 +173,7 @@ public void activateRule(String ruleId, int tenantId) throws RuleManagementExcep NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); try { jdbcTemplate.withTransaction(template -> { - jdbcTemplate.executeUpdate(RuleSQLConstants.Query.CHANGE_RULE_STATUS, + template.executeUpdate(RuleSQLConstants.Query.CHANGE_RULE_STATUS, statement -> { statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, true); statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); @@ -195,7 +199,7 @@ public void deactivateRule(String ruleId, int tenantId) throws RuleManagementExc NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); try { jdbcTemplate.withTransaction(template -> { - jdbcTemplate.executeUpdate(RuleSQLConstants.Query.CHANGE_RULE_STATUS, + template.executeUpdate(RuleSQLConstants.Query.CHANGE_RULE_STATUS, statement -> { statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, false); statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); @@ -235,63 +239,71 @@ private int getInternalRuleIdByRuleId(String ruleId, int tenantId) throws RuleMa NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); try { - return jdbcTemplate.fetchSingleRecord(RuleSQLConstants.Query.GET_RULE_INTERNAL_ID_BY_ID, - (resultSet, rowNumber) -> { - return resultSet.getInt(RuleSQLConstants.Column.RULE_INTERNAL_ID); - }, - statement -> { - statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - }); - } catch (DataAccessException e) { + return jdbcTemplate.withTransaction( + template -> template.fetchSingleRecord(RuleSQLConstants.Query.GET_RULE_INTERNAL_ID_BY_ID, + (resultSet, rowNumber) -> resultSet.getInt(RuleSQLConstants.Column.RULE_INTERNAL_ID), + statement -> { + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, ruleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + })); + } catch (TransactionException e) { throw new RuleManagementServerException("Error while retrieving the rule from the system.", e); } } - private void addRuleValueReferencesToDB(int internalRuleId, Rule rule, int tenantId) throws DataAccessException { + private void addRuleValueReferencesToDB(int internalRuleId, Rule rule, int tenantId) throws TransactionException { ORCombinedRule orCombinedRule = (ORCombinedRule) rule; NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); - jdbcTemplate.executeBatchInsert(RuleSQLConstants.Query.ADD_RULE_REFERENCES, - statement -> { - for (ANDCombinedRule rule1 : orCombinedRule.getRules()) { - for (Expression expression : rule1.getExpressions()) { - if (expression.getValue().getType() == Value.Type.REFERENCE) { - statement.setInt(RuleSQLConstants.Column.RULE_REFERENCE_ID, internalRuleId); - statement.setString(RuleSQLConstants.Column.FIELD_NAME, expression.getField()); - statement.setString(RuleSQLConstants.Column.FIELD_REFERENCE, - expression.getValue().getFieldValue()); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - statement.addBatch(); + jdbcTemplate.withTransaction(template -> { + template.executeBatchInsert(RuleSQLConstants.Query.ADD_RULE_REFERENCES, + statement -> { + for (ANDCombinedRule rule1 : orCombinedRule.getRules()) { + for (Expression expression : rule1.getExpressions()) { + if (expression.getValue().getType() == Value.Type.REFERENCE) { + statement.setInt(RuleSQLConstants.Column.RULE_REFERENCE_ID, internalRuleId); + statement.setString(RuleSQLConstants.Column.FIELD_NAME, expression.getField()); + statement.setString(RuleSQLConstants.Column.FIELD_REFERENCE, + expression.getValue().getFieldValue()); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + statement.addBatch(); + } } } - } - }, null); + }, null); + return null; + }); } private void updateRuleInDB(Rule rule, int tenantId) - throws DataAccessException, IOException, RuleManagementServerException { + throws IOException, TransactionException, RuleManagementServerException { InputStream ruleJsonAsInputStream = convertRuleToJson(rule); int ruleJsonStreamLength = ruleJsonAsInputStream.available(); NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); - jdbcTemplate.executeUpdate(RuleSQLConstants.Query.UPDATE_RULE, - statement -> { - statement.setBinaryStream(RuleSQLConstants.Column.RULE, ruleJsonAsInputStream, - ruleJsonStreamLength); - statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, rule.getId()); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - }); + jdbcTemplate.withTransaction(template -> { + template.executeUpdate(RuleSQLConstants.Query.UPDATE_RULE, + statement -> { + statement.setBinaryStream(RuleSQLConstants.Column.RULE, ruleJsonAsInputStream, + ruleJsonStreamLength); + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, rule.getId()); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + return null; + }); } - private void deleteRuleReferencesInDB(int internalRuleId, int tenantId) throws DataAccessException { + private void deleteRuleReferencesInDB(int internalRuleId, int tenantId) throws TransactionException { NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); - jdbcTemplate.executeUpdate(RuleSQLConstants.Query.DELETE_RULE_REFERENCES, - statement -> { - statement.setInt(RuleSQLConstants.Column.RULE_REFERENCE_ID, internalRuleId); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - }); + jdbcTemplate.withTransaction(template -> { + template.executeUpdate(RuleSQLConstants.Query.DELETE_RULE_REFERENCES, + statement -> { + statement.setInt(RuleSQLConstants.Column.RULE_REFERENCE_ID, internalRuleId); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + }); + return null; + }); } private InputStream convertRuleToJson(Rule rule) throws RuleManagementServerException { From c904b60008bc3efb85b9a7f46790b3c380649924 Mon Sep 17 00:00:00 2001 From: malithie Date: Mon, 16 Dec 2024 12:31:10 +0530 Subject: [PATCH 14/20] Remove redundant index. --- .../resources/dbscripts/db2.sql | 2 -- .../resources/dbscripts/h2.sql | 1 - .../resources/dbscripts/mssql.sql | 1 - .../resources/dbscripts/mysql-cluster.sql | 1 - .../resources/dbscripts/mysql.sql | 1 - .../resources/dbscripts/oracle.sql | 2 -- .../resources/dbscripts/oracle_rac.sql | 2 -- .../resources/dbscripts/postgresql.sql | 1 - 8 files changed, 11 deletions(-) diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql index c5eaf32a2c95..edfbe202e87c 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql @@ -2327,5 +2327,3 @@ CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID) / CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID) / -CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID) -/ diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql index 4bd3d9602960..66a166ca0363 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql @@ -1526,4 +1526,3 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID); -CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql index 6005467e137f..89238403e08b 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql @@ -1679,7 +1679,6 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID); -CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); GO diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql index 4283d3e649ac..46518616992c 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql @@ -1718,4 +1718,3 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID); -CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql index d15071109071..491fb324796b 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql @@ -1554,4 +1554,3 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID); -CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql index 349f97ea198c..d5409295ad14 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql @@ -2386,5 +2386,3 @@ CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID) / CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID) / -CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID) -/ diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql index 6a8a0b1d87a5..061d6a67f7b9 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql @@ -2290,5 +2290,3 @@ CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID) / CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID) / -CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID) -/ diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql index 00b43600a583..1d7e968f5b33 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql @@ -1807,4 +1807,3 @@ CREATE INDEX IDX_IDN_CERTIFICATE_UUID_TID ON IDN_CERTIFICATE (UUID, TENANT_ID); -- RULES -- CREATE INDEX IDX_IDN_RULE_UUID_TID ON IDN_RULE (UUID, TENANT_ID); CREATE INDEX IDX_IDN_RULE_REF_RID_TID ON IDN_RULE_REFERENCES (RULE_ID, TENANT_ID); -CREATE INDEX IDX_IDN_RULE_REF_FN_FREF_TID ON IDN_RULE_REFERENCES (FIELD_NAME, FIELD_REFERENCE, TENANT_ID); From 7fdd5a2eded9ac1b151bd3e9db12938771c58ea5 Mon Sep 17 00:00:00 2001 From: malithie Date: Mon, 16 Dec 2024 12:56:47 +0530 Subject: [PATCH 15/20] Fix reading rule id for legacy db types. --- .../dao/impl/RuleManagementDAOImpl.java | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java index a5ecd393d1c2..7001110aecfb 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java @@ -213,7 +213,7 @@ public void deactivateRule(String ruleId, int tenantId) throws RuleManagementExc } private int addRuleToDB(Rule rule, int tenantId) - throws TransactionException, IOException, RuleManagementServerException { + throws TransactionException, IOException, RuleManagementException { InputStream ruleJsonAsInputStream = convertRuleToJson(rule); int ruleJsonStreamLength = ruleJsonAsInputStream.available(); @@ -232,7 +232,14 @@ private int addRuleToDB(Rule rule, int tenantId) return null; }); - return internalId.get(); + int internalRuleId = internalId.get(); + // Not all JDBC drivers support getting the auto generated database ID. + // So if the ID is not returned, get the ID by querying the database. + if (internalRuleId == 0) { + internalRuleId = getInternalRuleIdByRuleId(rule.getId(), tenantId); + } + + return internalRuleId; } private int getInternalRuleIdByRuleId(String ruleId, int tenantId) throws RuleManagementException { @@ -255,24 +262,21 @@ private void addRuleValueReferencesToDB(int internalRuleId, Rule rule, int tenan ORCombinedRule orCombinedRule = (ORCombinedRule) rule; NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); - jdbcTemplate.withTransaction(template -> { - template.executeBatchInsert(RuleSQLConstants.Query.ADD_RULE_REFERENCES, - statement -> { - for (ANDCombinedRule rule1 : orCombinedRule.getRules()) { - for (Expression expression : rule1.getExpressions()) { - if (expression.getValue().getType() == Value.Type.REFERENCE) { - statement.setInt(RuleSQLConstants.Column.RULE_REFERENCE_ID, internalRuleId); - statement.setString(RuleSQLConstants.Column.FIELD_NAME, expression.getField()); - statement.setString(RuleSQLConstants.Column.FIELD_REFERENCE, - expression.getValue().getFieldValue()); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - statement.addBatch(); - } + jdbcTemplate.withTransaction(template -> template.executeBatchInsert(RuleSQLConstants.Query.ADD_RULE_REFERENCES, + statement -> { + for (ANDCombinedRule rule1 : orCombinedRule.getRules()) { + for (Expression expression : rule1.getExpressions()) { + if (expression.getValue().getType() == Value.Type.REFERENCE) { + statement.setInt(RuleSQLConstants.Column.RULE_REFERENCE_ID, internalRuleId); + statement.setString(RuleSQLConstants.Column.FIELD_NAME, expression.getField()); + statement.setString(RuleSQLConstants.Column.FIELD_REFERENCE, + expression.getValue().getFieldValue()); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + statement.addBatch(); } } - }, null); - return null; - }); + } + }, null)); } private void updateRuleInDB(Rule rule, int tenantId) From 574eeef686b1dbac5da460b33ee19fcd8645cae9 Mon Sep 17 00:00:00 2001 From: malithie Date: Mon, 16 Dec 2024 13:06:20 +0530 Subject: [PATCH 16/20] Fix returning internal id from lamda. --- .../dao/impl/RuleManagementDAOImpl.java | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java index 7001110aecfb..e2230522a301 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java @@ -38,7 +38,6 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import java.util.concurrent.atomic.AtomicInteger; /** * Rule Management DAO Implementation. @@ -218,21 +217,16 @@ private int addRuleToDB(Rule rule, int tenantId) InputStream ruleJsonAsInputStream = convertRuleToJson(rule); int ruleJsonStreamLength = ruleJsonAsInputStream.available(); NamedJdbcTemplate jdbcTemplate = new NamedJdbcTemplate(IdentityDatabaseUtil.getDataSource()); - AtomicInteger internalId = new AtomicInteger(); - jdbcTemplate.withTransaction(template -> { - internalId.set(template.executeInsert(RuleSQLConstants.Query.ADD_RULE, - statement -> { - statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, rule.getId()); - statement.setBinaryStream(RuleSQLConstants.Column.RULE, ruleJsonAsInputStream, - ruleJsonStreamLength); - statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, rule.isActive()); - statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); - statement.setString(RuleSQLConstants.Column.VERSION, V1); - }, rule, true)); - return null; - }); - - int internalRuleId = internalId.get(); + int internalRuleId = + jdbcTemplate.withTransaction(template -> template.executeInsert(RuleSQLConstants.Query.ADD_RULE, + statement -> { + statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, rule.getId()); + statement.setBinaryStream(RuleSQLConstants.Column.RULE, ruleJsonAsInputStream, + ruleJsonStreamLength); + statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, rule.isActive()); + statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); + statement.setString(RuleSQLConstants.Column.VERSION, V1); + }, rule, true)); // Not all JDBC drivers support getting the auto generated database ID. // So if the ID is not returned, get the ID by querying the database. if (internalRuleId == 0) { From ec5106d7d2f9d03c597de4ed18a8c330bc0a0e7c Mon Sep 17 00:00:00 2001 From: malithie Date: Mon, 16 Dec 2024 18:51:04 +0530 Subject: [PATCH 17/20] Change column name to avoid reserved keywords. --- .../rule/management/constant/RuleSQLConstants.java | 10 +++++----- .../management/dao/impl/RuleManagementDAOImpl.java | 6 +++--- .../src/test/resources/dbscripts/h2.sql | 2 +- .../resources/dbscripts/db2.sql | 2 +- .../resources/dbscripts/h2.sql | 2 +- .../resources/dbscripts/mssql.sql | 2 +- .../resources/dbscripts/mysql-cluster.sql | 2 +- .../resources/dbscripts/mysql.sql | 2 +- .../resources/dbscripts/oracle.sql | 2 +- .../resources/dbscripts/oracle_rac.sql | 2 +- .../resources/dbscripts/postgresql.sql | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java index 9181c07a6595..7dca06852288 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/constant/RuleSQLConstants.java @@ -35,7 +35,7 @@ public static class Column { public static final String RULE_INTERNAL_ID = "ID"; public static final String RULE_EXTERNAL_ID = "UUID"; - public static final String RULE = "RULE"; + public static final String RULE_CONTENT = "CONTENT"; public static final String IS_ACTIVE = "IS_ACTIVE"; public static final String TENANT_ID = "TENANT_ID"; public static final String VERSION = "VERSION"; @@ -53,20 +53,20 @@ private Column() { */ public static class Query { - public static final String ADD_RULE = "INSERT INTO IDN_RULE (UUID, RULE, IS_ACTIVE, TENANT_ID, VERSION) " + - "VALUES (:UUID;, :RULE;, :IS_ACTIVE;, :TENANT_ID;, :VERSION;)"; + public static final String ADD_RULE = "INSERT INTO IDN_RULE (UUID, CONTENT, IS_ACTIVE, TENANT_ID, VERSION) " + + "VALUES (:UUID;, :CONTENT;, :IS_ACTIVE;, :TENANT_ID;, :VERSION;)"; public static final String ADD_RULE_REFERENCES = "INSERT INTO IDN_RULE_REFERENCES (RULE_ID, " + "FIELD_NAME, FIELD_REFERENCE, TENANT_ID) VALUES (:RULE_ID;, :FIELD_NAME;, :FIELD_REFERENCE;, " + ":TENANT_ID;)"; public static final String UPDATE_RULE = - "UPDATE IDN_RULE SET RULE = :RULE; WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; + "UPDATE IDN_RULE SET CONTENT = :CONTENT; WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; public static final String DELETE_RULE_REFERENCES = "DELETE FROM IDN_RULE_REFERENCES WHERE RULE_ID = :RULE_ID; AND TENANT_ID = :TENANT_ID;"; public static final String DELETE_RULE = "DELETE FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; public static final String CHANGE_RULE_STATUS = "UPDATE IDN_RULE SET IS_ACTIVE = :IS_ACTIVE; WHERE UUID = " + ":UUID; AND TENANT_ID = :TENANT_ID;"; public static final String GET_RULE_BY_ID = - "SELECT RULE, IS_ACTIVE FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; + "SELECT CONTENT, IS_ACTIVE FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; public static final String GET_RULE_INTERNAL_ID_BY_ID = "SELECT ID FROM IDN_RULE WHERE UUID = :UUID; AND TENANT_ID = :TENANT_ID;"; diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java index e2230522a301..d87dab7cca1c 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/RuleManagementDAOImpl.java @@ -137,7 +137,7 @@ public Rule getRuleByRuleId(String ruleId, int tenantId) throws RuleManagementEx jdbcTemplate.withTransaction( template -> template.fetchSingleRecord(RuleSQLConstants.Query.GET_RULE_BY_ID, (resultSet, rowNumber) -> { - ruleData.setRuleJson(resultSet.getString(RuleSQLConstants.Column.RULE)); + ruleData.setRuleJson(resultSet.getString(RuleSQLConstants.Column.RULE_CONTENT)); ruleData.setActive(resultSet.getBoolean(RuleSQLConstants.Column.IS_ACTIVE)); return null; }, @@ -221,7 +221,7 @@ private int addRuleToDB(Rule rule, int tenantId) jdbcTemplate.withTransaction(template -> template.executeInsert(RuleSQLConstants.Query.ADD_RULE, statement -> { statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, rule.getId()); - statement.setBinaryStream(RuleSQLConstants.Column.RULE, ruleJsonAsInputStream, + statement.setBinaryStream(RuleSQLConstants.Column.RULE_CONTENT, ruleJsonAsInputStream, ruleJsonStreamLength); statement.setBoolean(RuleSQLConstants.Column.IS_ACTIVE, rule.isActive()); statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); @@ -282,7 +282,7 @@ private void updateRuleInDB(Rule rule, int tenantId) jdbcTemplate.withTransaction(template -> { template.executeUpdate(RuleSQLConstants.Query.UPDATE_RULE, statement -> { - statement.setBinaryStream(RuleSQLConstants.Column.RULE, ruleJsonAsInputStream, + statement.setBinaryStream(RuleSQLConstants.Column.RULE_CONTENT, ruleJsonAsInputStream, ruleJsonStreamLength); statement.setString(RuleSQLConstants.Column.RULE_EXTERNAL_ID, rule.getId()); statement.setInt(RuleSQLConstants.Column.TENANT_ID, tenantId); diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql index 9d743720928e..6e6236d38fa6 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/test/resources/dbscripts/h2.sql @@ -1,7 +1,7 @@ CREATE TABLE IF NOT EXISTS IDN_RULE ( ID INTEGER NOT NULL AUTO_INCREMENT, UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, + CONTENT BLOB NOT NULL, IS_ACTIVE BOOLEAN DEFAULT TRUE, TENANT_ID INTEGER NOT NULL, VERSION VARCHAR(15) NOT NULL, diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql index edfbe202e87c..d3d82979bfa1 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql @@ -2122,7 +2122,7 @@ REFERENCING NEW AS NEW FOR EACH ROW MODE DB2SQL CREATE TABLE IDN_RULE ( ID INTEGER NOT NULL, UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, + CONTENT BLOB NOT NULL, IS_ACTIVE BOOLEAN DEFAULT TRUE, TENANT_ID INTEGER NOT NULL, VERSION VARCHAR(15) NOT NULL, diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql index 66a166ca0363..157798e62243 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql @@ -1392,7 +1392,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_TOKEN_CLAIMS ( CREATE TABLE IF NOT EXISTS IDN_RULE ( ID INTEGER NOT NULL AUTO_INCREMENT, UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, + CONTENT BLOB NOT NULL, IS_ACTIVE BOOLEAN DEFAULT TRUE, TENANT_ID INTEGER NOT NULL, VERSION VARCHAR(15) NOT NULL, diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql index 89238403e08b..7c226e0de85c 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql @@ -1543,7 +1543,7 @@ IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[ID CREATE TABLE IDN_RULE ( ID INTEGER IDENTITY, UUID CHAR(36) NOT NULL, - RULE VARBINARY(MAX) NOT NULL, + CONTENT VARBINARY(MAX) NOT NULL, IS_ACTIVE BIT DEFAULT 1, TENANT_ID INTEGER NOT NULL, VERSION VARCHAR(15) NOT NULL, diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql index 46518616992c..e6ad012475e4 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql @@ -1555,7 +1555,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_TOKEN_CLAIMS ( CREATE TABLE IF NOT EXISTS IDN_RULE ( ID INTEGER AUTO_INCREMENT, UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, + CONTENT BLOB NOT NULL, IS_ACTIVE BOOLEAN DEFAULT TRUE, TENANT_ID INTEGER NOT NULL, VERSION VARCHAR(15) NOT NULL, diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql index 491fb324796b..9a13c19c79ba 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql @@ -1423,7 +1423,7 @@ CREATE TABLE IF NOT EXISTS IDN_OAUTH2_TOKEN_CLAIMS ( CREATE TABLE IF NOT EXISTS IDN_RULE ( ID INTEGER AUTO_INCREMENT, UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, + CONTENT BLOB NOT NULL, IS_ACTIVE BOOLEAN DEFAULT TRUE, TENANT_ID INTEGER NOT NULL, VERSION VARCHAR(15) NOT NULL, diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql index d5409295ad14..a9f41488ef6d 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql @@ -2187,7 +2187,7 @@ CREATE OR REPLACE TRIGGER IDN_OAUTH2_TOKEN_CLAIMS_TRIG CREATE TABLE IDN_RULE ( ID INTEGER, UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, + CONTENT BLOB NOT NULL, IS_ACTIVE CHAR (1) DEFAULT '1', TENANT_ID INTEGER NOT NULL, VERSION VARCHAR(15) NOT NULL, diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql index 061d6a67f7b9..2f599ed26e2a 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql @@ -2120,7 +2120,7 @@ CREATE OR REPLACE TRIGGER IDN_OAUTH2_TOKEN_CLAIMS_TRIG CREATE TABLE IDN_RULE ( ID INTEGER, UUID CHAR(36) NOT NULL, - RULE BLOB NOT NULL, + CONTENT BLOB NOT NULL, IS_ACTIVE CHAR (1) DEFAULT '1', TENANT_ID INTEGER NOT NULL, VERSION VARCHAR(15) NOT NULL, diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql index 1d7e968f5b33..1840e4bd0a21 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql @@ -1667,7 +1667,7 @@ CREATE SEQUENCE IDN_RULE_SEQ; CREATE TABLE IDN_RULE ( ID INTEGER NOT NULL DEFAULT NEXTVAL('IDN_RULE_SEQ'), UUID CHAR(36) NOT NULL, - RULE BYTEA NOT NULL, + CONTENT BYTEA NOT NULL, IS_ACTIVE BOOLEAN DEFAULT TRUE, TENANT_ID INTEGER NOT NULL, VERSION VARCHAR(15) NOT NULL, From c0b83b6a74ec05af5ac0600d62c39f3807d4d9c0 Mon Sep 17 00:00:00 2001 From: malithie Date: Wed, 18 Dec 2024 10:07:03 +0530 Subject: [PATCH 18/20] Update version to reflect master version. --- .../rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml index cb99b2a9d4e7..d589878e3102 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework rule-mgt - 7.7.38-SNAPSHOT + 7.7.46-SNAPSHOT ../pom.xml From ac8f488160418823b43274a2def4b73c75bc6b43 Mon Sep 17 00:00:00 2001 From: Malithi Madara Edirisinghe Date: Wed, 18 Dec 2024 11:07:52 +0530 Subject: [PATCH 19/20] Update components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java Co-authored-by: Ashan Thamara Palihakkara <75057725+ashanthamara@users.noreply.github.com> --- .../rule/management/dao/impl/CacheBackedRuleManagementDAO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java index 1d722b034392..e926a34f2965 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/src/main/java/org/wso2/carbon/identity/rule/management/dao/impl/CacheBackedRuleManagementDAO.java @@ -104,7 +104,7 @@ public void deleteRule(String ruleId, int tenantId) throws RuleManagementExcepti @Override public Rule getRuleByRuleId(String ruleId, int tenantId) throws RuleManagementException { - RuleCacheEntry ruleCacheEntry = RuleCache.getInstance().getValueFromCache(new RuleCacheKey(ruleId), tenantId); + RuleCacheEntry ruleCacheEntry = ruleCache.getValueFromCache(new RuleCacheKey(ruleId), tenantId); if (ruleCacheEntry != null && ruleCacheEntry.getRule() != null) { LOG.debug("Rule cache hit for rule id: " + ruleId + ". Returning from cache."); return ruleCacheEntry.getRule(); From 7f86c4f0da76a584d465bb91a56de0eb1de6be1a Mon Sep 17 00:00:00 2001 From: malithie Date: Wed, 18 Dec 2024 11:31:43 +0530 Subject: [PATCH 20/20] Update version to reflect master version. --- .../rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml index d589878e3102..eb0c64971890 100644 --- a/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml +++ b/components/rule-mgt/org.wso2.carbon.identity.rule.management/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework rule-mgt - 7.7.46-SNAPSHOT + 7.7.48-SNAPSHOT ../pom.xml