From 7c51876198700d1e5d33e72c15a6e0ab01c686b8 Mon Sep 17 00:00:00 2001
From: Thumimku <thumilan.15@cse.mrt.ac.lk>
Date: Wed, 1 Nov 2023 16:10:43 +0530
Subject: [PATCH 1/3] init

---
 .../resources/conf/catalina.properties        |  1 +
 modules/p2-profile-gen/pom.xml                |  7 +++
 pom.xml                                       | 61 +++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --git a/modules/distribution/src/repository/resources/conf/catalina.properties b/modules/distribution/src/repository/resources/conf/catalina.properties
index 8a92d5326bf..e5d2638422d 100644
--- a/modules/distribution/src/repository/resources/conf/catalina.properties
+++ b/modules/distribution/src/repository/resources/conf/catalina.properties
@@ -109,6 +109,7 @@ org.wso2.carbon.identity.api.user.challenge.common-*.jar,\
 org.wso2.carbon.identity.api.user.common-*.jar,\
 org.wso2.carbon.identity.api.user.session.common-*.jar,\
 org.wso2.carbon.identity.application.authentication.endpoint.util-*.jar,\
+org.wso2.carbon.identity.client.attestation.filter-*.jar,\
 org.wso2.carbon.identity.oauth.client.authn.filter-*.jar,\
 org.wso2.carbon.identity.rest.api.server.challenge.*.jar,\
 org.wso2.carbon.identity.rest.api.server.claim.management.*.jar,\
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 43dbb640b7f..8a34939c2f2 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -532,6 +532,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.framework:org.wso2.carbon.identity.input.validation.mgt.server.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.client.attestation.mgt.server.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.framework:org.wso2.carbon.identity.consent.server.configs.mgt.server.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
@@ -1095,6 +1098,10 @@
                                     <id>org.wso2.carbon.identity.input.validation.mgt.server.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.client.attestation.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.consent.server.configs.mgt.server.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
diff --git a/pom.xml b/pom.xml
index 07d83d1a409..2196cdec669 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2004,6 +2004,16 @@
                 <artifactId>org.wso2.carbon.identity.input.validation.mgt.server.feature</artifactId>
                 <version>${carbon.identity.framework.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.client.attestation.mgt</artifactId>
+                <version>${carbon.identity.framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.client.attestation.mgt.server.feature</artifactId>
+                <version>${carbon.identity.framework.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.consent.server.configs.mgt</artifactId>
@@ -2154,6 +2164,52 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+<!--            Google Attestation dependency-->
+
+            <!--Google Library for android attestation client-->
+            <dependency>
+                <groupId>org.wso2.orbit.com.google.api-services-playintegrity</groupId>
+                <artifactId>google-api-services-playintegrity</artifactId>
+                <version>2.0.0.wso2v1</version>
+            </dependency>
+
+            <!--Google Library for oauth credentials-->
+            <dependency>
+                <groupId>org.wso2.orbit.com.google.auth-library-oauth2-http</groupId>
+                <artifactId>google-auth-library-oauth2-http</artifactId>
+                <version>1.20.0.wso2v1</version>
+            </dependency>
+
+            <!--Google Library for http client-->
+            <dependency>
+                <groupId>org.wso2.orbit.com.google.http-client</groupId>
+                <artifactId>google-http-client</artifactId>
+                <version>1.43.3.wso2v1</version>
+            </dependency>
+
+<!--            // TODO check delete-->
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.orbit.com.google.oauth-client</groupId>-->
+<!--                <artifactId>google-oauth-client</artifactId>-->
+<!--                <version>1.33.3.wso2v1</version>-->
+<!--            </dependency>-->
+
+            <!--Google Library for gson client-->
+            <dependency>
+                <groupId>org.wso2.orbit.com.google.api-client</groupId>
+                <artifactId>google-api-client</artifactId>
+                <version>2.2.0.wso2v1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.orbit.io.opencensus</groupId>
+                <artifactId>opencensus</artifactId>
+                <version>0.31.1.wso2v1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.orbit.io.grpc</groupId>
+                <artifactId>grpc-context</artifactId>
+                <version>1.27.2.wso2v1</version>
+            </dependency>
             <!-- Pax Logging -->
             <dependency>
                 <groupId>org.wso2.org.ops4j.pax.logging</groupId>
@@ -2577,6 +2633,11 @@
         <org.apache.logging.log4j.version>2.17.1</org.apache.logging.log4j.version>
         <org.apache.log4j.wso2.version>1.2.17.wso2v1</org.apache.log4j.wso2.version>
 
+        <com.google.api.playintegrity.version>1.0.0.wso2v1</com.google.api.playintegrity.version>
+        <com.google.auth.version>1.20.0.wso2v1</com.google.auth.version>
+        <com.google.http.client.version>1.43.3.wso2v1</com.google.http.client.version>
+        <com.google.gson.client.version>2.2.0.wso2v1</com.google.gson.client.version>
+
         <project.scm.id>my-scm-server</project.scm.id>
 
     </properties>

From 0e35a4b72ca408175e8568df6813963a9d37a024 Mon Sep 17 00:00:00 2001
From: Thumimku <thumilan.15@cse.mrt.ac.lk>
Date: Wed, 8 Nov 2023 13:54:16 +0530
Subject: [PATCH 2/3] bump version

---
 pom.xml | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2196cdec669..32878caba62 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2170,45 +2170,38 @@
             <dependency>
                 <groupId>org.wso2.orbit.com.google.api-services-playintegrity</groupId>
                 <artifactId>google-api-services-playintegrity</artifactId>
-                <version>2.0.0.wso2v1</version>
+                <version>${com.google.api.playintegrity.version}</version>
             </dependency>
 
             <!--Google Library for oauth credentials-->
             <dependency>
                 <groupId>org.wso2.orbit.com.google.auth-library-oauth2-http</groupId>
                 <artifactId>google-auth-library-oauth2-http</artifactId>
-                <version>1.20.0.wso2v1</version>
+                <version>${com.google.auth.version}</version>
             </dependency>
 
             <!--Google Library for http client-->
             <dependency>
                 <groupId>org.wso2.orbit.com.google.http-client</groupId>
                 <artifactId>google-http-client</artifactId>
-                <version>1.43.3.wso2v1</version>
+                <version>${com.google.http.client.version}</version>
             </dependency>
 
-<!--            // TODO check delete-->
-<!--            <dependency>-->
-<!--                <groupId>org.wso2.orbit.com.google.oauth-client</groupId>-->
-<!--                <artifactId>google-oauth-client</artifactId>-->
-<!--                <version>1.33.3.wso2v1</version>-->
-<!--            </dependency>-->
-
             <!--Google Library for gson client-->
             <dependency>
                 <groupId>org.wso2.orbit.com.google.api-client</groupId>
                 <artifactId>google-api-client</artifactId>
-                <version>2.2.0.wso2v1</version>
+                <version>${com.google.api.client.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.orbit.io.opencensus</groupId>
                 <artifactId>opencensus</artifactId>
-                <version>0.31.1.wso2v1</version>
+                <version>${org.wso2.orbit.io.opencensus.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.orbit.io.grpc</groupId>
                 <artifactId>grpc-context</artifactId>
-                <version>1.27.2.wso2v1</version>
+                <version>${org.wso2.orbit.io.grpc.version}</version>
             </dependency>
             <!-- Pax Logging -->
             <dependency>
@@ -2359,7 +2352,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.25.491</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.496</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 6.0.0]</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->
@@ -2633,11 +2626,12 @@
         <org.apache.logging.log4j.version>2.17.1</org.apache.logging.log4j.version>
         <org.apache.log4j.wso2.version>1.2.17.wso2v1</org.apache.log4j.wso2.version>
 
-        <com.google.api.playintegrity.version>1.0.0.wso2v1</com.google.api.playintegrity.version>
+        <com.google.api.playintegrity.version>2.0.0.wso2v1</com.google.api.playintegrity.version>
         <com.google.auth.version>1.20.0.wso2v1</com.google.auth.version>
         <com.google.http.client.version>1.43.3.wso2v1</com.google.http.client.version>
-        <com.google.gson.client.version>2.2.0.wso2v1</com.google.gson.client.version>
-
+        <com.google.api.client.version>2.2.0.wso2v1</com.google.api.client.version>
+        <org.wso2.orbit.io.opencensus.version>0.31.1.wso2v1</org.wso2.orbit.io.opencensus.version>
+        <org.wso2.orbit.io.grpc.version>1.59.0.wso2v1</org.wso2.orbit.io.grpc.version>
         <project.scm.id>my-scm-server</project.scm.id>
 
     </properties>

From 5e6350e3de21c5a461f1319c3020e445d96d5e38 Mon Sep 17 00:00:00 2001
From: Thumimku <thumilan.15@cse.mrt.ac.lk>
Date: Wed, 8 Nov 2023 14:40:52 +0530
Subject: [PATCH 3/3] revert add dependency

---
 pom.xml | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/pom.xml b/pom.xml
index 32878caba62..64682c31e2f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2164,45 +2164,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-<!--            Google Attestation dependency-->
-
-            <!--Google Library for android attestation client-->
-            <dependency>
-                <groupId>org.wso2.orbit.com.google.api-services-playintegrity</groupId>
-                <artifactId>google-api-services-playintegrity</artifactId>
-                <version>${com.google.api.playintegrity.version}</version>
-            </dependency>
-
-            <!--Google Library for oauth credentials-->
-            <dependency>
-                <groupId>org.wso2.orbit.com.google.auth-library-oauth2-http</groupId>
-                <artifactId>google-auth-library-oauth2-http</artifactId>
-                <version>${com.google.auth.version}</version>
-            </dependency>
-
-            <!--Google Library for http client-->
-            <dependency>
-                <groupId>org.wso2.orbit.com.google.http-client</groupId>
-                <artifactId>google-http-client</artifactId>
-                <version>${com.google.http.client.version}</version>
-            </dependency>
-
-            <!--Google Library for gson client-->
-            <dependency>
-                <groupId>org.wso2.orbit.com.google.api-client</groupId>
-                <artifactId>google-api-client</artifactId>
-                <version>${com.google.api.client.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.orbit.io.opencensus</groupId>
-                <artifactId>opencensus</artifactId>
-                <version>${org.wso2.orbit.io.opencensus.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.orbit.io.grpc</groupId>
-                <artifactId>grpc-context</artifactId>
-                <version>${org.wso2.orbit.io.grpc.version}</version>
-            </dependency>
             <!-- Pax Logging -->
             <dependency>
                 <groupId>org.wso2.org.ops4j.pax.logging</groupId>
@@ -2626,12 +2587,6 @@
         <org.apache.logging.log4j.version>2.17.1</org.apache.logging.log4j.version>
         <org.apache.log4j.wso2.version>1.2.17.wso2v1</org.apache.log4j.wso2.version>
 
-        <com.google.api.playintegrity.version>2.0.0.wso2v1</com.google.api.playintegrity.version>
-        <com.google.auth.version>1.20.0.wso2v1</com.google.auth.version>
-        <com.google.http.client.version>1.43.3.wso2v1</com.google.http.client.version>
-        <com.google.api.client.version>2.2.0.wso2v1</com.google.api.client.version>
-        <org.wso2.orbit.io.opencensus.version>0.31.1.wso2v1</org.wso2.orbit.io.opencensus.version>
-        <org.wso2.orbit.io.grpc.version>1.59.0.wso2v1</org.wso2.orbit.io.grpc.version>
         <project.scm.id>my-scm-server</project.scm.id>
 
     </properties>