From afa34621274e87ff843312aa760ee694da4cc4d7 Mon Sep 17 00:00:00 2001
From: Anup Nehe <anup.nehe@technoforte.co.in>
Date: Mon, 7 Oct 2024 13:45:30 +0530
Subject: [PATCH 1/3] updated pom and readme

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
---
 ui-test/README.md | 15 +++++----------
 ui-test/pom.xml   | 13 +++++++++++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ui-test/README.md b/ui-test/README.md
index 2612c3bf..0fcc84f2 100644
--- a/ui-test/README.md
+++ b/ui-test/README.md
@@ -10,16 +10,11 @@ Ensure the following software is installed on the machine from where the automat
 - The project requires JDK 21
 - Maven 3.6.0 or higher
 
-## Build
-1. Clone the repository by git clone https://github.com/mosip/inji-verify.git 
-2. Change directory by using command 'cd ../uitest-injiverify'  & Build the JAR file: `mvn clean package -DskipTests=true`
-3. The JAR file will be generated in the `target` directory.
-
 ## BrowserStack
-1. singup to browserStack & get the userName and accessKey from home page on browserStack
-2. update the userName and accessKey from browserstack.yml
-3. update the device from tag `platforms` from `https://www.browserstack.com/list-of-browsers-and-platforms/automate` (Windows, Mac)
-4. Open command prompt and change directory by using command 'cd ../inji-web-test'
+1. Sign up for BrowserStack and retrieve your userName and accessKey from the homepage on BrowserStack.
+2. Update the userName and accessKey from browserstack.yml
+3. Update the device from tag `platforms` from `https://www.browserstack.com/list-of-browsers-and-platforms/automate` (Windows, Mac)
+4. Open command prompt and change directory by using command 'cd ../inji-verify'
 5. Hit the command `mvn clean test -DtestngXmlFile=TestNg.xml`, for running the UI automation test
 
 ## Configurations
@@ -29,4 +24,4 @@ Ensure the following software is installed on the machine from where the automat
 
 ## Reports
 
-Test reports will be available in the `test-output>>ExtentReports>>SparkReports` directory after test execution.
\ No newline at end of file
+After test execution, the test reports can be found in the `test-output/ExtentReports/SparkReports` directory.
\ No newline at end of file
diff --git a/ui-test/pom.xml b/ui-test/pom.xml
index 581640f2..e4e0f82b 100644
--- a/ui-test/pom.xml
+++ b/ui-test/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mosip.uiautomation</groupId>
 	<artifactId>uitest-injiverify</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.10.0-SNAPSHOT</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -12,6 +12,8 @@
 		<selenium.version>4.11.0</selenium.version>
 		<cucumber.testing.version>7.2.3</cucumber.testing.version>
 		<surefire.plugin.version>3.0.0-M5</surefire.plugin.version>
+		<!-- Lombok -->
+		<lombok.version>1.18.30</lombok.version>
 	</properties>
 
 	<dependencies>
@@ -21,6 +23,13 @@
 			<version>${selenium.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>${lombok.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -139,4 +148,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>

From ad591819913212efee563c9469faab2fc705a2ed Mon Sep 17 00:00:00 2001
From: Anup Nehe <anup.nehe@technoforte.co.in>
Date: Mon, 7 Oct 2024 13:49:23 +0530
Subject: [PATCH 2/3] resolve conflicts

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
---
 ui-test/pom.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ui-test/pom.xml b/ui-test/pom.xml
index e4e0f82b..9ddf5dcd 100644
--- a/ui-test/pom.xml
+++ b/ui-test/pom.xml
@@ -12,8 +12,6 @@
 		<selenium.version>4.11.0</selenium.version>
 		<cucumber.testing.version>7.2.3</cucumber.testing.version>
 		<surefire.plugin.version>3.0.0-M5</surefire.plugin.version>
-		<!-- Lombok -->
-		<lombok.version>1.18.30</lombok.version>
 	</properties>
 
 	<dependencies>
@@ -23,13 +21,6 @@
 			<version>${selenium.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>${lombok.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>

From 18e0d55e9692dc692bbdc8cece89df66ddd53eb7 Mon Sep 17 00:00:00 2001
From: Anup Nehe <anup.nehe@technoforte.co.in>
Date: Mon, 7 Oct 2024 13:53:07 +0530
Subject: [PATCH 3/3] resolve conflicts

Signed-off-by: Anup Nehe <anup.nehe@technoforte.co.in>
---
 ui-test/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-test/README.md b/ui-test/README.md
index 0fcc84f2..700a1bf6 100644
--- a/ui-test/README.md
+++ b/ui-test/README.md
@@ -19,7 +19,7 @@ Ensure the following software is installed on the machine from where the automat
 
 ## Configurations
 
-1. Update `featurefile>>UploadQRCodepage.feature` to modify data in examples section.
+1. Update `resources>>featurefile>>UploadQRCodepage.feature` to modify data in examples section.
 
 
 ## Reports