From 9f4c772d4808c45abd9839cb66abd5ff986e6233 Mon Sep 17 00:00:00 2001
From: Mohanachandran S <165888272+mohanachandran-s@users.noreply.github.com>
Date: Tue, 4 Jun 2024 11:44:04 +0530
Subject: [PATCH] MOSIP-32363 - Merged from develop branch and updated the
 maven plugins for JAVA21 (#977)

* MOSIP-32363 JAVA 21 upgrade

Signed-off-by: Mohanachandran S <mohanachandran.s@technoforte.co.in>

* Updated the API commons artifact ID

Signed-off-by: Mohanachandran S <mohanachandran.s@technoforte.co.in>

* Merged from the develop branch

Signed-off-by: Mohanachandran S <mohanachandran.s@technoforte.co.in>

---------

Signed-off-by: Mohanachandran S <mohanachandran.s@technoforte.co.in>
---
 apitest/Dockerfile                            |   2 +-
 apitest/entrypoint.sh                         |   2 +-
 apitest/pom.xml                               | 238 +++++++++++++++++-
 .../ReactivateVIDsForUIN.yml                  |   2 +-
 .../RetrieveAuthTypeStatus.yml                |   8 +-
 .../UpdateVIDStatus/UpdateVidStatus.yml       |   4 +-
 apitest/testNgXmlFiles/IdrepositoryApi.xml    |   2 +-
 7 files changed, 244 insertions(+), 14 deletions(-)

diff --git a/apitest/Dockerfile b/apitest/Dockerfile
index bc00e7589..287c09bd2 100644
--- a/apitest/Dockerfile
+++ b/apitest/Dockerfile
@@ -37,7 +37,7 @@ WORKDIR /home/${container_user}
 
 ENV work_dir=/home/${container_user}
 
-ADD ./target/ $work_dir
+ADD ./apitest/target/ $work_dir
 
 ADD entrypoint.sh $work_dir/entrypoint.sh
 
diff --git a/apitest/entrypoint.sh b/apitest/entrypoint.sh
index b56500353..7c15e41cc 100644
--- a/apitest/entrypoint.sh
+++ b/apitest/entrypoint.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 ## Run automationtests
-java -jar -Dmodules="$MODULES" -Denv.user="$ENV_USER" -Denv.endpoint="$ENV_ENDPOINT" -Denv.testLevel="$ENV_TESTLEVEL" automationtests.jar;
+java -jar -Dmodules="$MODULES" -Denv.user="$ENV_USER" -Denv.endpoint="$ENV_ENDPOINT" -Denv.testLevel="$ENV_TESTLEVEL" apitest-idrepo-*-jar-with-dependencies.jar;
\ No newline at end of file
diff --git a/apitest/pom.xml b/apitest/pom.xml
index 12f8fe75c..2d4dbea5e 100644
--- a/apitest/pom.xml
+++ b/apitest/pom.xml
@@ -24,15 +24,245 @@
 		<tag>HEAD</tag>
 	</scm>
 
+	<developers>
+		<developer>
+			<name>Mosip</name>
+			<email>mosip.emailnotifier@gmail.com</email>
+			<organization>io.mosip</organization>
+			<organizationUrl>https://github.com/mosip/id-repository</organizationUrl>
+		</developer>
+	</developers>
 
-	<dependencies>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+		<!-- maven -->
+		<maven.compiler.target>21</maven.compiler.target>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.version>3.8.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.javadoc.version>3.2.0</maven.javadoc.version>
+		<maven.gpg.plugin.version>1.5</maven.gpg.plugin.version>
+		<maven.shade.plugin.version>3.2.4</maven.shade.plugin.version>
+		<maven.antrun.plugin.version>3.0.0</maven.antrun.plugin.version>
+		<maven.source.plugin.version>2.2.1</maven.source.plugin.version>
+
+		<git.commit.id.plugin.version>3.0.1</git.commit.id.plugin.version>
+		<fileName>apitest-idrepo-1.2.1-java21-SNAPSHOT-jar-with-dependencies</fileName>
+	</properties>
 
+	<dependencies>
 		<dependency>
 			<groupId>io.mosip.testrig.apirig.automationtests.commons</groupId>
 			<artifactId>apitest-commons</artifactId>
 			<version>1.2.1-java21-SNAPSHOT</version>
 		</dependency>
-		
 	</dependencies>
-	
-</project>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+			</plugins>
+		</pluginManagement>
+
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<doclint>none</doclint>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${maven.compiler.version}</version>
+				<configuration>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
+					<argLine>-Dfile.encoding=UTF-8</argLine>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>${maven.javadoc.version}</version>
+				<configuration>
+					<doclint>none</doclint>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<version>${git.commit.id.plugin.version}</version>
+				<executions>
+					<execution>
+						<id>populate-git-commit-information</id>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+						<configuration>
+							<verbose>true</verbose>
+							<dateFormat>MM/dd/yyyy HH:mm:ss Z</dateFormat>
+							<abbrevLength>8</abbrevLength>
+							<generateGitPropertiesFile>true</generateGitPropertiesFile>
+							<generateGitPropertiesFilename>
+								${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+						</configuration>
+					</execution>
+				</executions>
+				<configuration>
+					<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-gpg-plugin</artifactId>
+				<version>${maven.gpg.plugin.version}</version>
+				<executions>
+					<execution>
+						<id>sign-artifacts</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>sign</goal>
+						</goals>
+						<configuration>
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</gpgArguments>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>${maven.shade.plugin.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<finalName>${fileName}</finalName>
+							<transformers>
+								<!-- need this to merge the services files
+								properly -->
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+								<!-- add Main-Class to manifest file -->
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>
+										io.mosip.testrig.apirig.testrunner.MosipTestRunner</mainClass>
+								</transformer>
+							</transformers>
+							<!-- add this to prevent some security issues when
+							merging everything together -->
+							<filters>
+								<filter>
+									<artifact>*:*</artifact>
+									<excludes>
+										<exclude>META-INF/*.SF</exclude>
+										<exclude>META-INF/*.DSA</exclude>
+										<exclude>META-INF/*.RSA</exclude>
+									</excludes>
+								</filter>
+							</filters>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>${maven.jar.plugin.version}</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+						<manifestEntries>
+							<Project-Name>${project.name}</Project-Name>
+							<Project-Version>${project.version}</Project-Version>
+							<Built-By>${user.name}</Built-By>
+							<Built-OS>${os.name}</Built-OS>
+							<Local-Build-Date>${maven.build.timestamp}</Local-Build-Date>
+							<Build-Number>${env.BUILD_NUMBER}</Build-Number>
+							<Build-Date>${env.BUILD_ID}</Build-Date>
+							<Build-URL>${env.BUILD_URL}</Build-URL>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>${maven.war.plugin.version}</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+						<manifestEntries>
+							<Project-Name>${project.name}</Project-Name>
+							<Project-Version>${project.version}</Project-Version>
+							<Built-By>${user.name}</Built-By>
+							<Built-OS>${os.name}</Built-OS>
+							<Local-Build-Date>${maven.build.timestamp}</Local-Build-Date>
+							<Build-Number>${env.BUILD_NUMBER}</Build-Number>
+							<Build-Date>${env.BUILD_ID}</Build-Date>
+							<Build-URL>${env.BUILD_URL}</Build-URL>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>${maven.source.plugin.version}</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>${maven.antrun.plugin.version}</version>
+				<executions>
+					<execution>
+						<id>make-jar-executable</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<!-- Create a shell script to run the JAR file
+								with executable permission -->
+								<chmod file="${project.build.directory}/*.jar"
+									perm="ugo+rx" />
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/apitest/src/main/resources/idRepository/ReactivateVIDsForUIN/ReactivateVIDsForUIN.yml b/apitest/src/main/resources/idRepository/ReactivateVIDsForUIN/ReactivateVIDsForUIN.yml
index 719d64f73..a0fb1cee7 100644
--- a/apitest/src/main/resources/idRepository/ReactivateVIDsForUIN/ReactivateVIDsForUIN.yml
+++ b/apitest/src/main/resources/idRepository/ReactivateVIDsForUIN/ReactivateVIDsForUIN.yml
@@ -23,7 +23,7 @@ ReactivateVIDs:
       inputTemplate: idRepository/ReactivateVIDsForUIN/reactivateVIDsForUIN
       outputTemplate: idRepository/ReactivateVIDsForUIN/reactivateVIDsForUINResult
       input: '{
-    "UIN": "$ID:AddIdentity_For_DeactivateScen_smoke_Pos_UIN$",
+    "UIN": "$ID:AddIdentity_ValidParam_smoke_Pos_UIN$",
     "requesttime": "$TIMESTAMP$",
     "id": "mosip.vid.reactivate",
     "version": "v1"
diff --git a/apitest/src/main/resources/idRepository/RetrieveAuthTypeStatus/RetrieveAuthTypeStatus.yml b/apitest/src/main/resources/idRepository/RetrieveAuthTypeStatus/RetrieveAuthTypeStatus.yml
index f4c75c712..6ab30185b 100644
--- a/apitest/src/main/resources/idRepository/RetrieveAuthTypeStatus/RetrieveAuthTypeStatus.yml
+++ b/apitest/src/main/resources/idRepository/RetrieveAuthTypeStatus/RetrieveAuthTypeStatus.yml
@@ -43,7 +43,7 @@ RetrieveAuthTypeStatus:
       output: '{
         "errors": [
     {
-      "errorCode": "IDR-IDC-004"
+      "errorCode": "IDR-IDC-002"
     }
   ]
 }'
@@ -77,7 +77,7 @@ RetrieveAuthTypeStatus:
       output: '{
         "errors": [
     {
-      "errorCode": "IDR-IDC-004"
+      "errorCode": "IDR-IDC-002"
     }
   ]
 }'
@@ -94,7 +94,7 @@ RetrieveAuthTypeStatus:
       output: '{
         "errors": [
     {
-      "errorCode": "IDR-IDC-004"
+      "errorCode": "IDR-IDC-002"
     }
   ]
 }'
@@ -128,7 +128,7 @@ RetrieveAuthTypeStatus:
       output: '{
         "errors": [
     {
-      "errorCode": "IDR-IDC-004"
+      "errorCode": "IDR-IDC-002"
     }
   ]
 }'
\ No newline at end of file
diff --git a/apitest/src/main/resources/idRepository/UpdateVIDStatus/UpdateVidStatus.yml b/apitest/src/main/resources/idRepository/UpdateVIDStatus/UpdateVidStatus.yml
index 9283a3406..d72540e1b 100644
--- a/apitest/src/main/resources/idRepository/UpdateVIDStatus/UpdateVidStatus.yml
+++ b/apitest/src/main/resources/idRepository/UpdateVIDStatus/UpdateVidStatus.yml
@@ -848,12 +848,12 @@ UpdateVidStatus:
       inputTemplate: idRepository/UpdateVIDStatus/updateVidStatus
       outputTemplate: idRepository/UpdateVIDStatus/UpdateVidStatusResult
       input: '{
-    "vidStatus": "ACTIVATED",
+    "vidStatus": "ACTIVE",
     "id": "mosip.vid.update",
     "VID": "$ID:CreateVID_withValidParameters_For_VidType_Smoke_Temporary_sid_VID$",
     "version": "v1",
   "requesttime": "$TIMESTAMP$"
 }'
       output: '{
-    "vidStatus": "ACTIVATED"
+    "vidStatus": "ACTIVE"
 }'
\ No newline at end of file
diff --git a/apitest/testNgXmlFiles/IdrepositoryApi.xml b/apitest/testNgXmlFiles/IdrepositoryApi.xml
index e8a88fce7..c43bbc9d5 100644
--- a/apitest/testNgXmlFiles/IdrepositoryApi.xml
+++ b/apitest/testNgXmlFiles/IdrepositoryApi.xml
@@ -5,7 +5,7 @@
 	<!-- Passing Group as parmeter unsing "testType" Possible Groups are: smoke 
 		regression smokeAndRegression -->
 	<listeners>
-		<listener class-name="io.mosip.testrig.apirig.report.EmailableReport" />
+		<listener class-name="io.mosip.testrig.apirig.report.EmailableReport"/>
 	</listeners>