From fae2a540601fc605cee60a04b36a85bbd4197bb6 Mon Sep 17 00:00:00 2001
From: senthalan <senthalank@gmail.com>
Date: Mon, 5 Aug 2019 13:16:32 +0530
Subject: [PATCH 1/5] Update to Pax Logging and reformat the pom

---
 component/helper/pom.xml                      |  73 +++----
 .../IdentityHelperServiceComponent.java       |  15 +-
 pom.xml                                       | 191 +++++-------------
 3 files changed, 100 insertions(+), 179 deletions(-)

diff --git a/component/helper/pom.xml b/component/helper/pom.xml
index 0bd0c6e..a688ae0 100644
--- a/component/helper/pom.xml
+++ b/component/helper/pom.xml
@@ -29,27 +29,41 @@
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Library For Identity Extension Helper</name>
     <url>http://wso2.org</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>${pax.logging.api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <artifactId>org.wso2.carbon.identity.application.common</artifactId>
+            <version>${carbon.identity.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <artifactId>org.wso2.carbon.identity.core</artifactId>
+            <version>${carbon.identity.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
+            <version>${carbon.identity.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.user.core</artifactId>
+            <version>${carbon.kernel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <artifactId>org.wso2.carbon.identity.mgt</artifactId>
+            <version>${carbon.identity.version}</version>
+        </dependency>
+    </dependencies>
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.3.5</version>
-                    <extensions>true</extensions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -62,19 +76,19 @@
                             org.wso2.carbon.extension.identity.helper.internal
                         </Private-Package>
                         <Import-Package>
-                            org.apache.commons.logging.*; version="1.0.4",
+                            org.apache.commons.logging.*; version="${commons-logging.osgi.version.range}",
                             org.osgi.framework,
-                            org.wso2.carbon.identity.application.authentication.framework.*; version="${carbon.identity.package.import.version.range}",
-                            org.wso2.carbon.identity.application.common.model; version="${carbon.identity.package.import.version.range}",
+                            org.wso2.carbon.identity.application.authentication.framework.*; version="${carbon.identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.identity.application.common.model; version="${carbon.identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.base; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.core.model; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.core.util; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.mgt; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.mgt.dto; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.mgt.store; version="${carbon.identity.package.import.version.range}",
+                            org.wso2.carbon.user.core.*; version="${carbon.kernel.package.import.version.range}",
                             javax.servlet,
                             javax.servlet.http,
-                            org.apache.oltu.oauth2.*; version="${oltu.package.import.version.range}",
                             *;resolution:=optional
                         </Import-Package>
                         <Export-Package>
@@ -85,19 +99,6 @@
                     </instructions>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-                <version>1.7.2</version>
-                <executions>
-                    <execution>
-                        <id>generate-scr-scrdescriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/component/helper/src/main/java/org/wso2/carbon/extension/identity/helper/internal/IdentityHelperServiceComponent.java b/component/helper/src/main/java/org/wso2/carbon/extension/identity/helper/internal/IdentityHelperServiceComponent.java
index 499a4d8..c985531 100644
--- a/component/helper/src/main/java/org/wso2/carbon/extension/identity/helper/internal/IdentityHelperServiceComponent.java
+++ b/component/helper/src/main/java/org/wso2/carbon/extension/identity/helper/internal/IdentityHelperServiceComponent.java
@@ -21,19 +21,18 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.extension.identity.helper.FederatedAuthenticatorUtil;
-import org.wso2.carbon.identity.application.authentication.framework.ApplicationAuthenticator;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
 
-import java.util.Hashtable;
-
-/**
- * @scr.component name="identity.application.helper.AuthenticationFramework.component" immediate="true"
- */
+@Component(name = "identity.application.helper.AuthenticationFramework.component", immediate = true)
 public class IdentityHelperServiceComponent {
 
     private static Log log = LogFactory.getLog(IdentityHelperServiceComponent.class);
 
+    @Activate
     protected void activate(ComponentContext ctxt) {
+
         try {
             if (log.isDebugEnabled()) {
                 log.debug("Authentication Common Extension Framework is activated");
@@ -43,7 +42,9 @@ protected void activate(ComponentContext ctxt) {
         }
     }
 
+    @Deactivate
     protected void deactivate(ComponentContext ctxt) {
+
         if (log.isDebugEnabled()) {
             log.debug("Authentication Common Extension Framework is deactivated");
         }
diff --git a/pom.xml b/pom.xml
index b3036bc..8a42000 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,12 +17,13 @@
  ~ under the License.
  -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.wso2</groupId>
         <artifactId>wso2</artifactId>
-        <version>1</version>
+        <version>1.2</version>
     </parent>
     <groupId>org.wso2.carbon.extension.identity.authenticator.utils</groupId>
     <artifactId>identity-extension-utils</artifactId>
@@ -30,121 +31,47 @@
     <packaging>pom</packaging>
     <name>WSO2 Carbon Extension - Identity Extension Utils Pom</name>
     <url>http://wso2.org</url>
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>component/helper</module>
-                <module>feature</module>
-            </modules>
-        </profile>
-    </profiles>
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.idp.mgt</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
-            <version>${commons-logging.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.application.common</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.user.profile</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.user.account.association</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.core</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.notification.mgt</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.provisioning</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.core</artifactId>
-            <version>${carbon.kernel.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.user.core</artifactId>
-            <version>${carbon.kernel.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.oltu.oauth2</groupId>
-            <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>${org.apache.oltu.oauth2.client-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.jettison</groupId>
-                    <artifactId>jettison</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.oltu.oauth2</groupId>
-            <artifactId>org.apache.oltu.oauth2.common</artifactId>
-            <version>1.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.application.authenticator.openid</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.application.authenticator.oidc</artifactId>
-            <version>${carbon.identity.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.ui</artifactId>
-            <version>${carbon.kernel.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.json.wso2</groupId>
-            <artifactId>json</artifactId>
-            <version>${wso2.json}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity</groupId>
-            <artifactId>org.wso2.carbon.identity.mgt</artifactId>
-            <version>5.2.0</version>
-        </dependency>
-    </dependencies>
+
+    <modules>
+        <module>component/helper</module>
+        <module>feature</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-api</artifactId>
+                <version>${pax.logging.api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.application.common</artifactId>
+                <version>${carbon.identity.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.core</artifactId>
+                <version>${carbon.identity.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
+                <version>${carbon.identity.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.user.core</artifactId>
+                <version>${carbon.kernel.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.mgt</artifactId>
+                <version>${carbon.identity.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+>>>>>>> 6f18ca2 (Update to Pax Logging and reformat the pom)
     <scm>
         <connection>scm:git:https://github.com/wso2-extensions/identity-extension-utils.git
         </connection>
@@ -193,30 +120,16 @@
                 <version>2.3.1</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.3.5</version>
                     <extensions>true</extensions>
                     <configuration>
                         <obrRepository>NONE</obrRepository>
@@ -331,14 +244,20 @@
     <properties>
         <carbon.identity.package.export.project.version>${project.version}
         </carbon.identity.package.export.project.version>
-        <carbon.identity.version>5.0.7</carbon.identity.version>
+        <carbon.identity.version>7.6.3</carbon.identity.version>
         <commons-logging.version>4.4.3</commons-logging.version>
-        <carbon.kernel.version>4.4.3</carbon.kernel.version>
+        <carbon.kernel.version>4.10.24</carbon.kernel.version>
         <oltu.version>1.0.0.wso2v2</oltu.version>
         <org.apache.oltu.oauth2.client-version>0.31</org.apache.oltu.oauth2.client-version>
         <org.apache.oltu.oauth2.client.version>1.0.0</org.apache.oltu.oauth2.client.version>
         <oltu.package.import.version.range>[1.0.0, 2.0.0)</oltu.package.import.version.range>
         <wso2.json>3.0.0.wso2v5</wso2.json>
-        <carbon.identity.package.import.version.range>[5.0.0, 8.0.0)</carbon.identity.package.import.version.range>
+        <carbon.identity.framework.imp.pkg.version.range>[5.14.0, 8.0.0)
+        </carbon.identity.framework.imp.pkg.version.range>
+        <carbon.kernel.package.import.version.range>[4.5.0, 5.0.0)</carbon.kernel.package.import.version.range>
+
+        <!-- Pax Logging Version -->
+        <pax.logging.api.version>1.10.1</pax.logging.api.version>
+        <commons-logging.osgi.version.range>[1.2.0,2.0.0)</commons-logging.osgi.version.range>
     </properties>
 </project>

From 61b835b2268e7535a3e5cf33e48741c606125731 Mon Sep 17 00:00:00 2001
From: asha15 <165079T@uom.lk>
Date: Tue, 12 Nov 2024 13:01:57 +0530
Subject: [PATCH 2/5] Fix build issues

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8a42000..7884d13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
->>>>>>> 6f18ca2 (Update to Pax Logging and reformat the pom)
+
     <scm>
         <connection>scm:git:https://github.com/wso2-extensions/identity-extension-utils.git
         </connection>

From 76ac47ff2d0ebcafdc516ce62504d6b89e41f963 Mon Sep 17 00:00:00 2001
From: asha15 <165079T@uom.lk>
Date: Tue, 26 Nov 2024 17:16:56 +0530
Subject: [PATCH 3/5] Add maven bundle plugin version

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7884d13..01ec784 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
+                    <version>3.2.0</version>
                     <extensions>true</extensions>
                     <configuration>
                         <obrRepository>NONE</obrRepository>
@@ -244,7 +245,7 @@
     <properties>
         <carbon.identity.package.export.project.version>${project.version}
         </carbon.identity.package.export.project.version>
-        <carbon.identity.version>7.6.3</carbon.identity.version>
+        <carbon.identity.version>7.7.1</carbon.identity.version>
         <commons-logging.version>4.4.3</commons-logging.version>
         <carbon.kernel.version>4.10.24</carbon.kernel.version>
         <oltu.version>1.0.0.wso2v2</oltu.version>

From 931834533cd22f61235ea34531d02ec4f6319d5d Mon Sep 17 00:00:00 2001
From: asha15 <165079T@uom.lk>
Date: Tue, 26 Nov 2024 17:17:26 +0530
Subject: [PATCH 4/5] Refactor the code

---
 component/helper/pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/component/helper/pom.xml b/component/helper/pom.xml
index a688ae0..b192f6b 100644
--- a/component/helper/pom.xml
+++ b/component/helper/pom.xml
@@ -80,12 +80,12 @@
                             org.osgi.framework,
                             org.wso2.carbon.identity.application.authentication.framework.*; version="${carbon.identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.application.common.model; version="${carbon.identity.framework.imp.pkg.version.range}",
-                            org.wso2.carbon.identity.base; version="${carbon.identity.package.import.version.range}",
-                            org.wso2.carbon.identity.core.model; version="${carbon.identity.package.import.version.range}",
-                            org.wso2.carbon.identity.core.util; version="${carbon.identity.package.import.version.range}",
-                            org.wso2.carbon.identity.mgt; version="${carbon.identity.package.import.version.range}",
-                            org.wso2.carbon.identity.mgt.dto; version="${carbon.identity.package.import.version.range}",
-                            org.wso2.carbon.identity.mgt.store; version="${carbon.identity.package.import.version.range}",
+                            org.wso2.carbon.identity.base; version="${carbon.identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.identity.core.model; version="${carbon.identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.identity.core.util; version="${carbon.identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.identity.mgt; version="${carbon.identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.identity.mgt.dto; version="${carbon.identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.identity.mgt.store; version="${carbon.identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.user.core.*; version="${carbon.kernel.package.import.version.range}",
                             javax.servlet,
                             javax.servlet.http,

From 14de92d83770fc802ddf049551c74ab4ace675e5 Mon Sep 17 00:00:00 2001
From: asha15 <165079T@uom.lk>
Date: Thu, 28 Nov 2024 17:25:32 +0530
Subject: [PATCH 5/5] Add maven compiler plugin

---
 component/helper/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/component/helper/pom.xml b/component/helper/pom.xml
index b192f6b..2312f34 100644
--- a/component/helper/pom.xml
+++ b/component/helper/pom.xml
@@ -64,6 +64,15 @@
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <inherited>true</inherited>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>