From 848f616c90412d8d98e1f548f2e350b8bb891160 Mon Sep 17 00:00:00 2001
From: Mohanachandran S <mohanachandran.s@technoforte.co.in>
Date: Wed, 24 Apr 2024 10:17:34 +0530
Subject: [PATCH 1/4] MOSIP-32363 JAVA 21 upgrade

Signed-off-by: Mohanachandran S <mohanachandran.s@technoforte.co.in>
---
 apitest/pom.xml                      | 167 ++-------------------------
 apitest/testNgXmlFiles/preregApi.xml |   6 +-
 2 files changed, 13 insertions(+), 160 deletions(-)

diff --git a/apitest/pom.xml b/apitest/pom.xml
index ea09bc5229..28c3599744 100644
--- a/apitest/pom.xml
+++ b/apitest/pom.xml
@@ -3,12 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mosip.testrig.apirig.automationtests.prereg</groupId>
-	<artifactId>automationtests-prereg</artifactId>
+	<artifactId>apitest-prereg</artifactId>
 	<packaging>jar</packaging>
-	<name>automationtests-prereg</name>
-	<description>Parent project of MOSIP functional tests</description>
-	<url>https://github.com/mosip/mosip-functional-tests</url>
-	<version>1.2.0.1-SNAPSHOT</version>
+	<name>apitest-prereg</name>
+	<description>Parent project of MOSIP Pre-Registration apitests</description>
+	<url>https://github.com/mosip/pre-registration</url>
+	<version>1.2.1-java21-SNAPSHOT</version>
 
 	<licenses>
 		<license>
@@ -18,166 +18,19 @@
 	</licenses>
 
 	<scm>
-		<connection>scm:git:git://github.com/mosip/mosip-functional-tests.git</connection>
-		<developerConnection>scm:git:ssh://github.com:mosip/mosip-functional-tests.git</developerConnection>
-		<url>https://github.com/mosip/mosip-functional-tests</url>
+		<connection>scm:git:git://github.com/mosip/pre-registration.git</connection>
+		<developerConnection>scm:git:ssh://github.com:mosip/pre-registration.git</developerConnection>
+		<url>https://github.com/mosip/pre-registration</url>
 		<tag>HEAD</tag>
 	</scm>
+	
 
-
-
-
-	<properties>
-		<!-- kernel versions -->
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-		<!-- maven -->
-		<maven.compiler.target>11</maven.compiler.target>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.version>3.7.0</maven.compiler.version>
-		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
-		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
-		<maven.surefire.plugin.version>2.9</maven.surefire.plugin.version>
-		<maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version>
-		<maven.sonar.plugin.version>3.2</maven.sonar.plugin.version>
-		<maven.javadoc.version>3.0.1</maven.javadoc.version>
-		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
-		<maven.javadoc.skip>false</maven.javadoc.skip>
-		<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>
-		<!-- spring -->
-		<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
-		<spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
-		<spring.security.test.version>5.0.5.RELEASE</spring.security.test.version>
-		<spring-cloud-config.version>2.0.0.RELEASE</spring-cloud-config.version>
-
-		<swagger.core.version>2.0.7</swagger.core.version>
-		<swagger.annotations.version>1.5.20</swagger.annotations.version>
-		<springfox.version>2.9.2</springfox.version>
-
-		<vertx.version>3.6.2</vertx.version>
-		<vertx.health.check.version>3.7.0</vertx.health.check.version>
-
-
-		<!-- javax -->
-		<javax.interceptor.version>1.2</javax.interceptor.version>
-		<javax.el-api.version>3.0.0</javax.el-api.version>
-		<javax.transaction.api.version>1.3</javax.transaction.api.version>
-		<javax.persistence.api.version>2.2</javax.persistence.api.version>
-		<javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
-		<glassfish.javax.el>2.2.6</glassfish.javax.el>
-
-		<!-- data -->
-		<h2.version>1.4.197</h2.version>
-		<mysql.connector.version>5.1.46</mysql.connector.version>
-		<postgresql.version>42.2.2</postgresql.version>
-		<eclipselink.version>2.5.0</eclipselink.version>
-		<hibernate.validator.version>6.0.12.Final</hibernate.validator.version>
-
-		<!-- test -->
-		<mockito.version>1.10.19</mockito.version>
-		<powermock.version>1.7.4</powermock.version>
-		<powermock.beta.version>2.0.0-beta.5</powermock.beta.version>
-
-		<!-- utilities -->
-		<commons-math3>3.6.1</commons-math3>
-		<commons-lang3>3.7</commons-lang3>
-		<commons-io>2.6</commons-io>
-		<commons-codec>1.11</commons-codec>
-		<commons-collections4.version>4.3</commons-collections4.version>
-		<commons.beanutils.version>1.9.2</commons.beanutils.version>
-		<commons.configuration2.version>2.2</commons.configuration2.version>
-		<apache.httpcomponents.version>4.5.6</apache.httpcomponents.version>
-		<guava.version>19.0</guava.version>
-		<lombok.version>1.18.8</lombok.version>
-		<jsch.version>0.1.54</jsch.version>
-		<sshd.version>1.4.0</sshd.version>
-		<itextcore.version>7.1.0</itextcore.version>
-		<itexthtml2pdf.version>2.0.0</itexthtml2pdf.version>
-		<itext.version>5.5.13</itext.version>
-		<freemarker.version>2.3.23</freemarker.version>
-		<velocity.version>1.7</velocity.version>
-		<velocity.tool.version>2.0</velocity.tool.version>
-		<datamapper.orika>1.5.2</datamapper.orika>
-		<modelmapper.version>2.1.1</modelmapper.version>
-		<bouncycastle.version>1.60</bouncycastle.version>
-		<icu4j.version>63.1</icu4j.version>
-		<seventeam-otp.version>1.0.0</seventeam-otp.version>
-		<google.zxing.version>3.3.3</google.zxing.version>
-		<hadoop-client>2.8.1</hadoop-client>
-		<htrace-core4>4.1.0-incubating</htrace-core4>
-		<aws.javasdk.version>1.11.368</aws.javasdk.version>
-		<s3mock.version>0.2.4</s3mock.version>
-		<ignite.version>2.3.0</ignite.version>
-		<findbugs.version>3.0.1</findbugs.version>
-		<byte.buddy.version>1.9.12</byte.buddy.version>
-		<io.jsonwebtoken.jjwt.version>0.6.0</io.jsonwebtoken.jjwt.version>
-		<apache.directory.api.version>2.0.0.AM2</apache.directory.api.version>
-		
-		
-		
-
-
-
-		<!-- registration versions -->
-		<maven.jacoco.version>0.8.2</maven.jacoco.version>
-		<javafx.version>2.2</javafx.version>
-		<maven.sonar.version>3.2</maven.sonar.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.version>3.7.0</maven.compiler.version>
-		<maven.javadoc.version>3.0.1</maven.javadoc.version>
-
-		<!-- Test & Logging -->
-		<logback.version>1.1.6</logback.version>
-		<slf4j.version>1.7.19</slf4j.version>
-		<mockito.version>1.10.19</mockito.version>
-
-		<!-- Orika Mapper -->
-		<orika.version>1.4.6</orika.version>
-
-		<!-- Spring version -->
-		<spring.version>5.0.6.RELEASE</spring.version>
-
-		<!-- Hibernate version -->
-		<hibernate.version>5.4.2.Final</hibernate.version>
-
-		<!-- Apache Commons DPC2 version -->
-		<apache.commons.dpce.version>2.1.1</apache.commons.dpce.version>
-
-		<!-- Derby Version -->
-		<apache.derby.version>10.13.1.1</apache.derby.version>
-
-		<!-- sourceafis Version -->
-		<sourceafis.version>3.4.0</sourceafis.version>
-
-		<!-- openimaj version -->
-		<org.openimaj.version>1.3.5</org.openimaj.version>
-
-		<!-- webcam-capture version -->
-		<webcam-capture.version>0.3.12</webcam-capture.version>
-
-		<!-- TSS Version -->
-		<tss.version>0.3.0</tss.version>
-
-		<!-- automationtests version -->
-		<wink-json4j-provider.version>1.1.2-incubating</wink-json4j-provider.version>
-		<kernel.version>1.2.0.1-B1</kernel.version>
-		<zjsonpatch.version>0.4.7</zjsonpatch.version>
-		<extentreports.aventstack.version>3.0.0</extentreports.aventstack.version>
-		<extentreports.relevantcodes.version>2.41.2</extentreports.relevantcodes.version>
-		<json-path.version>2.4.0</json-path.version>
-		<maven.model.version>3.3.9</maven.model.version>
-		<rest.assured.version>3.0.7</rest.assured.version>
-		<testng.version>6.11</testng.version>
-		<zt.zip.version>1.13</zt.zip.version>
-		<fileName>automationtests-commons-1.2.0.1-SNAPSHOT-jar-with-dependencies</fileName>
-		
-	</properties>
 	<dependencies>
 
 		<dependency>
 			<groupId>io.mosip.testrig.apirig.automationtests.commons</groupId>
 			<artifactId>automationtests-commons</artifactId>
-			<version>1.2.0.1-SNAPSHOT</version>
+			<version>1.2.1-java21-SNAPSHOT</version>
 		</dependency>
 		
 	</dependencies>
diff --git a/apitest/testNgXmlFiles/preregApi.xml b/apitest/testNgXmlFiles/preregApi.xml
index 0a14aee96e..37ffc314e7 100644
--- a/apitest/testNgXmlFiles/preregApi.xml
+++ b/apitest/testNgXmlFiles/preregApi.xml
@@ -5,7 +5,7 @@
 	<!-- Passing Group as parameter using "testType" Possible Groups are: smoke 
 		regression smokeAndRegression -->
 	<listeners>
-		<listener class-name="io.mosip.testrig.apirig.customReport.EmailableReport" />
+		<listener class-name="io.mosip.testrig.apirig.report.EmailableReport" />
 	</listeners>
 	
 	
@@ -16,7 +16,7 @@
 			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
 		</classes>
 	</test>
-	<!--<test name="ValidateOtp">
+	<test name="ValidateOtp">
 		<parameter name="ymlFile"
 			value="preReg/ValidateOtp/ValidateOtp.yml" />
 		<classes>
@@ -281,7 +281,7 @@
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>-->
+	</test>
 	
 	
 </suite>
\ No newline at end of file

From c3d3079fdb6c4e20ee0fb1447d7c3ba5d6b3fb2a Mon Sep 17 00:00:00 2001
From: Mohanachandran S <mohanachandran.s@technoforte.co.in>
Date: Wed, 24 Apr 2024 12:49:13 +0530
Subject: [PATCH 2/4] MOSIP-32363 reverting JAVA 21 upgrade

Signed-off-by: Mohanachandran S <mohanachandran.s@technoforte.co.in>
---
 apitest/pom.xml                      | 167 +++++++++++++++++++++++++--
 apitest/testNgXmlFiles/preregApi.xml |   6 +-
 2 files changed, 160 insertions(+), 13 deletions(-)

diff --git a/apitest/pom.xml b/apitest/pom.xml
index 28c3599744..ea09bc5229 100644
--- a/apitest/pom.xml
+++ b/apitest/pom.xml
@@ -3,12 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mosip.testrig.apirig.automationtests.prereg</groupId>
-	<artifactId>apitest-prereg</artifactId>
+	<artifactId>automationtests-prereg</artifactId>
 	<packaging>jar</packaging>
-	<name>apitest-prereg</name>
-	<description>Parent project of MOSIP Pre-Registration apitests</description>
-	<url>https://github.com/mosip/pre-registration</url>
-	<version>1.2.1-java21-SNAPSHOT</version>
+	<name>automationtests-prereg</name>
+	<description>Parent project of MOSIP functional tests</description>
+	<url>https://github.com/mosip/mosip-functional-tests</url>
+	<version>1.2.0.1-SNAPSHOT</version>
 
 	<licenses>
 		<license>
@@ -18,19 +18,166 @@
 	</licenses>
 
 	<scm>
-		<connection>scm:git:git://github.com/mosip/pre-registration.git</connection>
-		<developerConnection>scm:git:ssh://github.com:mosip/pre-registration.git</developerConnection>
-		<url>https://github.com/mosip/pre-registration</url>
+		<connection>scm:git:git://github.com/mosip/mosip-functional-tests.git</connection>
+		<developerConnection>scm:git:ssh://github.com:mosip/mosip-functional-tests.git</developerConnection>
+		<url>https://github.com/mosip/mosip-functional-tests</url>
 		<tag>HEAD</tag>
 	</scm>
-	
 
+
+
+
+	<properties>
+		<!-- kernel versions -->
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<!-- maven -->
+		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.version>3.7.0</maven.compiler.version>
+		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
+		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
+		<maven.surefire.plugin.version>2.9</maven.surefire.plugin.version>
+		<maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version>
+		<maven.sonar.plugin.version>3.2</maven.sonar.plugin.version>
+		<maven.javadoc.version>3.0.1</maven.javadoc.version>
+		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
+		<maven.javadoc.skip>false</maven.javadoc.skip>
+		<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>
+		<!-- spring -->
+		<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
+		<spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
+		<spring.security.test.version>5.0.5.RELEASE</spring.security.test.version>
+		<spring-cloud-config.version>2.0.0.RELEASE</spring-cloud-config.version>
+
+		<swagger.core.version>2.0.7</swagger.core.version>
+		<swagger.annotations.version>1.5.20</swagger.annotations.version>
+		<springfox.version>2.9.2</springfox.version>
+
+		<vertx.version>3.6.2</vertx.version>
+		<vertx.health.check.version>3.7.0</vertx.health.check.version>
+
+
+		<!-- javax -->
+		<javax.interceptor.version>1.2</javax.interceptor.version>
+		<javax.el-api.version>3.0.0</javax.el-api.version>
+		<javax.transaction.api.version>1.3</javax.transaction.api.version>
+		<javax.persistence.api.version>2.2</javax.persistence.api.version>
+		<javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
+		<glassfish.javax.el>2.2.6</glassfish.javax.el>
+
+		<!-- data -->
+		<h2.version>1.4.197</h2.version>
+		<mysql.connector.version>5.1.46</mysql.connector.version>
+		<postgresql.version>42.2.2</postgresql.version>
+		<eclipselink.version>2.5.0</eclipselink.version>
+		<hibernate.validator.version>6.0.12.Final</hibernate.validator.version>
+
+		<!-- test -->
+		<mockito.version>1.10.19</mockito.version>
+		<powermock.version>1.7.4</powermock.version>
+		<powermock.beta.version>2.0.0-beta.5</powermock.beta.version>
+
+		<!-- utilities -->
+		<commons-math3>3.6.1</commons-math3>
+		<commons-lang3>3.7</commons-lang3>
+		<commons-io>2.6</commons-io>
+		<commons-codec>1.11</commons-codec>
+		<commons-collections4.version>4.3</commons-collections4.version>
+		<commons.beanutils.version>1.9.2</commons.beanutils.version>
+		<commons.configuration2.version>2.2</commons.configuration2.version>
+		<apache.httpcomponents.version>4.5.6</apache.httpcomponents.version>
+		<guava.version>19.0</guava.version>
+		<lombok.version>1.18.8</lombok.version>
+		<jsch.version>0.1.54</jsch.version>
+		<sshd.version>1.4.0</sshd.version>
+		<itextcore.version>7.1.0</itextcore.version>
+		<itexthtml2pdf.version>2.0.0</itexthtml2pdf.version>
+		<itext.version>5.5.13</itext.version>
+		<freemarker.version>2.3.23</freemarker.version>
+		<velocity.version>1.7</velocity.version>
+		<velocity.tool.version>2.0</velocity.tool.version>
+		<datamapper.orika>1.5.2</datamapper.orika>
+		<modelmapper.version>2.1.1</modelmapper.version>
+		<bouncycastle.version>1.60</bouncycastle.version>
+		<icu4j.version>63.1</icu4j.version>
+		<seventeam-otp.version>1.0.0</seventeam-otp.version>
+		<google.zxing.version>3.3.3</google.zxing.version>
+		<hadoop-client>2.8.1</hadoop-client>
+		<htrace-core4>4.1.0-incubating</htrace-core4>
+		<aws.javasdk.version>1.11.368</aws.javasdk.version>
+		<s3mock.version>0.2.4</s3mock.version>
+		<ignite.version>2.3.0</ignite.version>
+		<findbugs.version>3.0.1</findbugs.version>
+		<byte.buddy.version>1.9.12</byte.buddy.version>
+		<io.jsonwebtoken.jjwt.version>0.6.0</io.jsonwebtoken.jjwt.version>
+		<apache.directory.api.version>2.0.0.AM2</apache.directory.api.version>
+		
+		
+		
+
+
+
+		<!-- registration versions -->
+		<maven.jacoco.version>0.8.2</maven.jacoco.version>
+		<javafx.version>2.2</javafx.version>
+		<maven.sonar.version>3.2</maven.sonar.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.version>3.7.0</maven.compiler.version>
+		<maven.javadoc.version>3.0.1</maven.javadoc.version>
+
+		<!-- Test & Logging -->
+		<logback.version>1.1.6</logback.version>
+		<slf4j.version>1.7.19</slf4j.version>
+		<mockito.version>1.10.19</mockito.version>
+
+		<!-- Orika Mapper -->
+		<orika.version>1.4.6</orika.version>
+
+		<!-- Spring version -->
+		<spring.version>5.0.6.RELEASE</spring.version>
+
+		<!-- Hibernate version -->
+		<hibernate.version>5.4.2.Final</hibernate.version>
+
+		<!-- Apache Commons DPC2 version -->
+		<apache.commons.dpce.version>2.1.1</apache.commons.dpce.version>
+
+		<!-- Derby Version -->
+		<apache.derby.version>10.13.1.1</apache.derby.version>
+
+		<!-- sourceafis Version -->
+		<sourceafis.version>3.4.0</sourceafis.version>
+
+		<!-- openimaj version -->
+		<org.openimaj.version>1.3.5</org.openimaj.version>
+
+		<!-- webcam-capture version -->
+		<webcam-capture.version>0.3.12</webcam-capture.version>
+
+		<!-- TSS Version -->
+		<tss.version>0.3.0</tss.version>
+
+		<!-- automationtests version -->
+		<wink-json4j-provider.version>1.1.2-incubating</wink-json4j-provider.version>
+		<kernel.version>1.2.0.1-B1</kernel.version>
+		<zjsonpatch.version>0.4.7</zjsonpatch.version>
+		<extentreports.aventstack.version>3.0.0</extentreports.aventstack.version>
+		<extentreports.relevantcodes.version>2.41.2</extentreports.relevantcodes.version>
+		<json-path.version>2.4.0</json-path.version>
+		<maven.model.version>3.3.9</maven.model.version>
+		<rest.assured.version>3.0.7</rest.assured.version>
+		<testng.version>6.11</testng.version>
+		<zt.zip.version>1.13</zt.zip.version>
+		<fileName>automationtests-commons-1.2.0.1-SNAPSHOT-jar-with-dependencies</fileName>
+		
+	</properties>
 	<dependencies>
 
 		<dependency>
 			<groupId>io.mosip.testrig.apirig.automationtests.commons</groupId>
 			<artifactId>automationtests-commons</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.0.1-SNAPSHOT</version>
 		</dependency>
 		
 	</dependencies>
diff --git a/apitest/testNgXmlFiles/preregApi.xml b/apitest/testNgXmlFiles/preregApi.xml
index 37ffc314e7..0a14aee96e 100644
--- a/apitest/testNgXmlFiles/preregApi.xml
+++ b/apitest/testNgXmlFiles/preregApi.xml
@@ -5,7 +5,7 @@
 	<!-- Passing Group as parameter using "testType" Possible Groups are: smoke 
 		regression smokeAndRegression -->
 	<listeners>
-		<listener class-name="io.mosip.testrig.apirig.report.EmailableReport" />
+		<listener class-name="io.mosip.testrig.apirig.customReport.EmailableReport" />
 	</listeners>
 	
 	
@@ -16,7 +16,7 @@
 			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
 		</classes>
 	</test>
-	<test name="ValidateOtp">
+	<!--<test name="ValidateOtp">
 		<parameter name="ymlFile"
 			value="preReg/ValidateOtp/ValidateOtp.yml" />
 		<classes>
@@ -281,7 +281,7 @@
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>
+	</test>-->
 	
 	
 </suite>
\ No newline at end of file

From 77514aa2ddb86572e2c571de5bc8ce6890a05ea4 Mon Sep 17 00:00:00 2001
From: Mohanachandran S <mohanachandran.s@technoforte.co.in>
Date: Fri, 26 Apr 2024 17:36:43 +0530
Subject: [PATCH 3/4] MOSIP-32363 JAVA 21 upgrade

Signed-off-by: Mohanachandran S <mohanachandran.s@technoforte.co.in>
---
 apitest/pom.xml                      | 167 ++-------------------------
 apitest/testNgXmlFiles/preregApi.xml |   6 +-
 2 files changed, 13 insertions(+), 160 deletions(-)

diff --git a/apitest/pom.xml b/apitest/pom.xml
index ea09bc5229..28c3599744 100644
--- a/apitest/pom.xml
+++ b/apitest/pom.xml
@@ -3,12 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mosip.testrig.apirig.automationtests.prereg</groupId>
-	<artifactId>automationtests-prereg</artifactId>
+	<artifactId>apitest-prereg</artifactId>
 	<packaging>jar</packaging>
-	<name>automationtests-prereg</name>
-	<description>Parent project of MOSIP functional tests</description>
-	<url>https://github.com/mosip/mosip-functional-tests</url>
-	<version>1.2.0.1-SNAPSHOT</version>
+	<name>apitest-prereg</name>
+	<description>Parent project of MOSIP Pre-Registration apitests</description>
+	<url>https://github.com/mosip/pre-registration</url>
+	<version>1.2.1-java21-SNAPSHOT</version>
 
 	<licenses>
 		<license>
@@ -18,166 +18,19 @@
 	</licenses>
 
 	<scm>
-		<connection>scm:git:git://github.com/mosip/mosip-functional-tests.git</connection>
-		<developerConnection>scm:git:ssh://github.com:mosip/mosip-functional-tests.git</developerConnection>
-		<url>https://github.com/mosip/mosip-functional-tests</url>
+		<connection>scm:git:git://github.com/mosip/pre-registration.git</connection>
+		<developerConnection>scm:git:ssh://github.com:mosip/pre-registration.git</developerConnection>
+		<url>https://github.com/mosip/pre-registration</url>
 		<tag>HEAD</tag>
 	</scm>
+	
 
-
-
-
-	<properties>
-		<!-- kernel versions -->
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-		<!-- maven -->
-		<maven.compiler.target>11</maven.compiler.target>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.version>3.7.0</maven.compiler.version>
-		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
-		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
-		<maven.surefire.plugin.version>2.9</maven.surefire.plugin.version>
-		<maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version>
-		<maven.sonar.plugin.version>3.2</maven.sonar.plugin.version>
-		<maven.javadoc.version>3.0.1</maven.javadoc.version>
-		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
-		<maven.javadoc.skip>false</maven.javadoc.skip>
-		<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>
-		<!-- spring -->
-		<spring.boot.version>2.0.2.RELEASE</spring.boot.version>
-		<spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
-		<spring.security.test.version>5.0.5.RELEASE</spring.security.test.version>
-		<spring-cloud-config.version>2.0.0.RELEASE</spring-cloud-config.version>
-
-		<swagger.core.version>2.0.7</swagger.core.version>
-		<swagger.annotations.version>1.5.20</swagger.annotations.version>
-		<springfox.version>2.9.2</springfox.version>
-
-		<vertx.version>3.6.2</vertx.version>
-		<vertx.health.check.version>3.7.0</vertx.health.check.version>
-
-
-		<!-- javax -->
-		<javax.interceptor.version>1.2</javax.interceptor.version>
-		<javax.el-api.version>3.0.0</javax.el-api.version>
-		<javax.transaction.api.version>1.3</javax.transaction.api.version>
-		<javax.persistence.api.version>2.2</javax.persistence.api.version>
-		<javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
-		<glassfish.javax.el>2.2.6</glassfish.javax.el>
-
-		<!-- data -->
-		<h2.version>1.4.197</h2.version>
-		<mysql.connector.version>5.1.46</mysql.connector.version>
-		<postgresql.version>42.2.2</postgresql.version>
-		<eclipselink.version>2.5.0</eclipselink.version>
-		<hibernate.validator.version>6.0.12.Final</hibernate.validator.version>
-
-		<!-- test -->
-		<mockito.version>1.10.19</mockito.version>
-		<powermock.version>1.7.4</powermock.version>
-		<powermock.beta.version>2.0.0-beta.5</powermock.beta.version>
-
-		<!-- utilities -->
-		<commons-math3>3.6.1</commons-math3>
-		<commons-lang3>3.7</commons-lang3>
-		<commons-io>2.6</commons-io>
-		<commons-codec>1.11</commons-codec>
-		<commons-collections4.version>4.3</commons-collections4.version>
-		<commons.beanutils.version>1.9.2</commons.beanutils.version>
-		<commons.configuration2.version>2.2</commons.configuration2.version>
-		<apache.httpcomponents.version>4.5.6</apache.httpcomponents.version>
-		<guava.version>19.0</guava.version>
-		<lombok.version>1.18.8</lombok.version>
-		<jsch.version>0.1.54</jsch.version>
-		<sshd.version>1.4.0</sshd.version>
-		<itextcore.version>7.1.0</itextcore.version>
-		<itexthtml2pdf.version>2.0.0</itexthtml2pdf.version>
-		<itext.version>5.5.13</itext.version>
-		<freemarker.version>2.3.23</freemarker.version>
-		<velocity.version>1.7</velocity.version>
-		<velocity.tool.version>2.0</velocity.tool.version>
-		<datamapper.orika>1.5.2</datamapper.orika>
-		<modelmapper.version>2.1.1</modelmapper.version>
-		<bouncycastle.version>1.60</bouncycastle.version>
-		<icu4j.version>63.1</icu4j.version>
-		<seventeam-otp.version>1.0.0</seventeam-otp.version>
-		<google.zxing.version>3.3.3</google.zxing.version>
-		<hadoop-client>2.8.1</hadoop-client>
-		<htrace-core4>4.1.0-incubating</htrace-core4>
-		<aws.javasdk.version>1.11.368</aws.javasdk.version>
-		<s3mock.version>0.2.4</s3mock.version>
-		<ignite.version>2.3.0</ignite.version>
-		<findbugs.version>3.0.1</findbugs.version>
-		<byte.buddy.version>1.9.12</byte.buddy.version>
-		<io.jsonwebtoken.jjwt.version>0.6.0</io.jsonwebtoken.jjwt.version>
-		<apache.directory.api.version>2.0.0.AM2</apache.directory.api.version>
-		
-		
-		
-
-
-
-		<!-- registration versions -->
-		<maven.jacoco.version>0.8.2</maven.jacoco.version>
-		<javafx.version>2.2</javafx.version>
-		<maven.sonar.version>3.2</maven.sonar.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.version>3.7.0</maven.compiler.version>
-		<maven.javadoc.version>3.0.1</maven.javadoc.version>
-
-		<!-- Test & Logging -->
-		<logback.version>1.1.6</logback.version>
-		<slf4j.version>1.7.19</slf4j.version>
-		<mockito.version>1.10.19</mockito.version>
-
-		<!-- Orika Mapper -->
-		<orika.version>1.4.6</orika.version>
-
-		<!-- Spring version -->
-		<spring.version>5.0.6.RELEASE</spring.version>
-
-		<!-- Hibernate version -->
-		<hibernate.version>5.4.2.Final</hibernate.version>
-
-		<!-- Apache Commons DPC2 version -->
-		<apache.commons.dpce.version>2.1.1</apache.commons.dpce.version>
-
-		<!-- Derby Version -->
-		<apache.derby.version>10.13.1.1</apache.derby.version>
-
-		<!-- sourceafis Version -->
-		<sourceafis.version>3.4.0</sourceafis.version>
-
-		<!-- openimaj version -->
-		<org.openimaj.version>1.3.5</org.openimaj.version>
-
-		<!-- webcam-capture version -->
-		<webcam-capture.version>0.3.12</webcam-capture.version>
-
-		<!-- TSS Version -->
-		<tss.version>0.3.0</tss.version>
-
-		<!-- automationtests version -->
-		<wink-json4j-provider.version>1.1.2-incubating</wink-json4j-provider.version>
-		<kernel.version>1.2.0.1-B1</kernel.version>
-		<zjsonpatch.version>0.4.7</zjsonpatch.version>
-		<extentreports.aventstack.version>3.0.0</extentreports.aventstack.version>
-		<extentreports.relevantcodes.version>2.41.2</extentreports.relevantcodes.version>
-		<json-path.version>2.4.0</json-path.version>
-		<maven.model.version>3.3.9</maven.model.version>
-		<rest.assured.version>3.0.7</rest.assured.version>
-		<testng.version>6.11</testng.version>
-		<zt.zip.version>1.13</zt.zip.version>
-		<fileName>automationtests-commons-1.2.0.1-SNAPSHOT-jar-with-dependencies</fileName>
-		
-	</properties>
 	<dependencies>
 
 		<dependency>
 			<groupId>io.mosip.testrig.apirig.automationtests.commons</groupId>
 			<artifactId>automationtests-commons</artifactId>
-			<version>1.2.0.1-SNAPSHOT</version>
+			<version>1.2.1-java21-SNAPSHOT</version>
 		</dependency>
 		
 	</dependencies>
diff --git a/apitest/testNgXmlFiles/preregApi.xml b/apitest/testNgXmlFiles/preregApi.xml
index 0a14aee96e..37ffc314e7 100644
--- a/apitest/testNgXmlFiles/preregApi.xml
+++ b/apitest/testNgXmlFiles/preregApi.xml
@@ -5,7 +5,7 @@
 	<!-- Passing Group as parameter using "testType" Possible Groups are: smoke 
 		regression smokeAndRegression -->
 	<listeners>
-		<listener class-name="io.mosip.testrig.apirig.customReport.EmailableReport" />
+		<listener class-name="io.mosip.testrig.apirig.report.EmailableReport" />
 	</listeners>
 	
 	
@@ -16,7 +16,7 @@
 			<class name="io.mosip.testrig.apirig.testscripts.SimplePost" />
 		</classes>
 	</test>
-	<!--<test name="ValidateOtp">
+	<test name="ValidateOtp">
 		<parameter name="ymlFile"
 			value="preReg/ValidateOtp/ValidateOtp.yml" />
 		<classes>
@@ -281,7 +281,7 @@
 		<classes>
 			<class name="io.mosip.testrig.apirig.testscripts.GetWithParam" />
 		</classes>
-	</test>-->
+	</test>
 	
 	
 </suite>
\ No newline at end of file

From 2dd1556b45aff2ebce1e1334814a17f8af971858 Mon Sep 17 00:00:00 2001
From: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com>
Date: Fri, 3 May 2024 16:13:05 +0530
Subject: [PATCH 4/4] Updated the API commons artifact ID

Signed-off-by: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com>
---
 apitest/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apitest/pom.xml b/apitest/pom.xml
index 28c3599744..8dabb537ac 100644
--- a/apitest/pom.xml
+++ b/apitest/pom.xml
@@ -29,7 +29,7 @@
 
 		<dependency>
 			<groupId>io.mosip.testrig.apirig.automationtests.commons</groupId>
-			<artifactId>automationtests-commons</artifactId>
+			<artifactId>apitest-commons</artifactId>
 			<version>1.2.1-java21-SNAPSHOT</version>
 		</dependency>