Bump org.hibernate:hibernate-core from 5.2.17.Final to 5.3.20.Final in /apitest-commons

.github/workflows/apitest-push-trigger.yml

@@ -44,7 +44,7 @@ jobs:
     secrets:
       OSSRH_USER: ${{ secrets.OSSRH_USER }}
       OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
-      OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }}
+      OSSRH_URL: ${{ secrets.RELEASE_URL }}
       OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
@@ -56,33 +56,6 @@ jobs:
     uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
     with:
       SERVICE_LOCATION: ./apitest-commons
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      ORG_KEY: ${{ secrets.ORG_KEY }}
-      OSSRH_USER: ${{ secrets.OSSRH_USER }}
-      OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
-      OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
-      GPG_SECRET: ${{ secrets.GPG_SECRET }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-
-  build-maven-authentication-demo-service:
-    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
-    with:
-      SERVICE_LOCATION: ./authentication-demo-service
-      BUILD_ARTIFACT: authentication-demo-service
-    secrets:
-      OSSRH_USER: ${{ secrets.OSSRH_USER }}
-      OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
-      OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
-      GPG_SECRET: ${{ secrets.GPG_SECRET }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-
-  sonar_analysis-authentication-demo-service:
-    needs: build-maven-authentication-demo-service
-    if: "${{  github.event_name != 'pull_request' }}"
-    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
-    with:
-      SERVICE_LOCATION: ./authentication-demo-service
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       ORG_KEY: ${{ secrets.ORG_KEY }}

README.md

@@ -34,7 +34,7 @@ To use this repository, ensure you have:
     <dependency>
       <groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
       <artifactId>apitest-commons</artifactId>
-      <version>1.3.2-SNAPSHOT</version>
+      <version>1.3.2</version>
     </dependency>
 
 ---

apitest-commons/README.md

@@ -14,6 +14,7 @@ The API Test Commons is a shared codebase used for executing module-wise automat
 - ESignet-signup
 - Mimoto
 - Inji-Certify
+- Inji-Verify
 
 ---
 
@@ -84,7 +85,7 @@ Ensure the following software is installed on the machine from where the automat
     <dependency>
       <groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
       <artifactId>apitest-commons</artifactId>
-      <version>1.3.2-SNAPSHOT</version>
+      <version>1.3.2</version>
     </dependency>
 
 ---

apitest-commons/pom.xml

@@ -8,7 +8,7 @@
 	<name>apitest-commons</name>
 	<description>Parent project of MOSIP functional tests</description>
 	<url>https://github.com/mosip/mosip-functional-tests</url>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>1.3.2</version>
 
 	<licenses>
 		<license>
@@ -55,7 +55,7 @@
 		<aws.javasdk.version>1.11.368</aws.javasdk.version>
 
 		<!-- Hibernate version -->
-		<hibernate.version>5.2.17.Final</hibernate.version>
+		<hibernate.version>5.3.20.Final</hibernate.version>
 
 		<!-- automationtests version -->
 		<wink-json4j-provider.version>1.1.2-incubating</wink-json4j-provider.version>
@@ -66,7 +66,7 @@
 		<maven.model.version>3.3.9</maven.model.version>
 		<testng.version>7.11.0</testng.version>
 		<zt.zip.version>1.13</zt.zip.version>
-		<fileName>apitest-commons-1.3.2-SNAPSHOT-jar-with-dependencies</fileName>
+		<fileName>apitest-commons-1.3.2-jar-with-dependencies</fileName>
 	</properties>
 
 	<dependencies>

apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java

@@ -2787,6 +2787,8 @@ public String inputJsonKeyWordHandeler(String jsonString, String testCaseName) {
 		}
 		if (jsonString.contains(GlobalConstants.TIMESTAMP))
 			jsonString = replaceKeywordWithValue(jsonString, GlobalConstants.TIMESTAMP, generateCurrentUTCTimeStamp());
+		if (jsonString.contains("$EXPIRYTIMESTAMP$"))
+			jsonString = replaceKeywordWithValue(jsonString, "$EXPIRYTIMESTAMP$", generateExpiryUTCTimeStamp());
 		if (jsonString.contains(GlobalConstants.TRANSACTION_ID))
 			jsonString = replaceKeywordWithValue(jsonString, GlobalConstants.TRANSACTION_ID, TRANSACTION_ID);
 		if (jsonString.contains("$DATESTAMP$"))
@@ -3276,6 +3278,14 @@ public static String generateCurrentUTCTimeStamp() {
 		dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
 		return dateFormat.format(date);
 	}
+
+	public static String generateExpiryUTCTimeStamp() {
+		Calendar calendar = Calendar.getInstance();
+		calendar.add(Calendar.SECOND, Integer.parseInt(ConfigManager.getproperty("expirationTime")));
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+		dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+		return dateFormat.format(calendar.getTime());
+	}
 
 	public static String generateCurrentUTCDateStamp() {
 		Date date = new Date();

apitest-commons/src/main/resources/config/Kernel.properties

@@ -129,7 +129,7 @@ admin_password=mosip123
 admin_userName=220005
 admin_zone_password=mosip123
 admin_zone_userName=globaladmin
-
+expirationTime=120
 
 
 #------------------------- Need to check if these are used or not ------------------------#