Resolve merge conflicts.

wso2 · Aug 22, 2023 · 36092db · 36092db
1 parent ccea44d
commit 36092db
Show file tree

Hide file tree

Showing 115 changed files with 27 additions and 10,430 deletions.
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
@@ -87,7 +87,7 @@
  <artifactId>org.wso2.carbon.identity.application.common</artifactId>
  </dependency>
  <dependency>
- <groupId>org.wso2.carbon.identity.framework</groupId>
+ <groupId>org.wso2.carbon.security.mgt</groupId>
  <artifactId>org.wso2.carbon.security.mgt</artifactId>
  </dependency>
  </dependencies>

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
@@ -90,7 +90,7 @@
  <artifactId>org.wso2.carbon.consent.mgt.core</artifactId>
  </dependency>
  <dependency>
- <groupId>org.wso2.carbon.identity.framework</groupId>
+ <groupId>org.wso2.carbon.security.mgt</groupId>
  <artifactId>org.wso2.carbon.security.mgt</artifactId>
  </dependency>
  <dependency>

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
@@ -80,7 +80,7 @@
  <artifactId>org.wso2.carbon.identity.application.default.auth.sequence.mgt.stub</artifactId>
  </dependency>
  <dependency>
- <groupId>org.wso2.carbon.identity.framework</groupId>
+ <groupId>org.wso2.carbon.security.mgt</groupId>
  <artifactId>org.wso2.carbon.security.mgt</artifactId>
  </dependency>
  </dependencies>

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
diff --git a/...carbon.security.mgt.ui/src/main/java/org/wso2/carbon/security/ui/SecurityUIConstants.java b/...carbon.security.mgt.ui/src/main/java/org/wso2/carbon/security/ui/SecurityUIConstants.java
diff --git a/....wso2.carbon.security.mgt.ui/src/main/java/org/wso2/carbon/security/ui/ServiceHolder.java b/....wso2.carbon.security.mgt.ui/src/main/java/org/wso2/carbon/security/ui/ServiceHolder.java
diff --git a/...y-mgt/org.wso2.carbon.security.mgt.ui/src/main/java/org/wso2/carbon/security/ui/Util.java b/...y-mgt/org.wso2.carbon.security.mgt.ui/src/main/java/org/wso2/carbon/security/ui/Util.java