MOSIP-36029

Signed-off-by: Jayesh Kharode <[email protected]>
mosip · Nov 11, 2024 · 21d367e · 21d367e
1 parent fda7e2e
commit 21d367e
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 68 deletions.
diff --git a/mosip-acceptance-tests/ivv-core/pom.xml b/mosip-acceptance-tests/ivv-core/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>io.mosip.testrig.dslrig.ivv</groupId>
 		<artifactId>dslrig-ivv-parent</artifactId>
-		<version>1.2.1-java21-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mosip.testrig.dslrig.ivv.core</groupId>
 	<artifactId>dslrig-ivv-core</artifactId>
-	<version>1.2.1-java21-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<properties>
 		<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>

diff --git a/mosip-acceptance-tests/ivv-dg/pom.xml b/mosip-acceptance-tests/ivv-dg/pom.xml
@@ -5,10 +5,10 @@
 	<parent>
 		<groupId>io.mosip.testrig.dslrig.ivv</groupId>
 		<artifactId>dslrig-ivv-parent</artifactId>
-		<version>1.2.1-java21-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<version>1.2.1-java21-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<groupId>io.mosip.testrig.dslrig.ivv.dg</groupId>
 	<artifactId>dslrig-ivv-dg</artifactId>
 
@@ -20,12 +20,12 @@
 		<dependency>
 			<groupId>io.mosip.testrig.dslrig.ivv.core</groupId>
 			<artifactId>dslrig-ivv-core</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.mosip.testrig.dslrig.ivv.parser</groupId>
 			<artifactId>dslrig-ivv-parser</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

diff --git a/mosip-acceptance-tests/ivv-orchestrator/pom.xml b/mosip-acceptance-tests/ivv-orchestrator/pom.xml
@@ -1,15 +1,19 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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>
+
 	<parent>
 		<groupId>io.mosip.testrig.dslrig.ivv</groupId>
 		<artifactId>dslrig-ivv-parent</artifactId>
-		<version>1.2.1-java21-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>io.mosip.testrig.dslrig.ivv.orchestrator</groupId>
 	<artifactId>dslrig-ivv-orchestrator</artifactId>
 	<name>mosip-dsl-test</name>
-	<version>1.2.1-java21-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
+
 	<properties>
 		<suiteXmlFile>testng.xml</suiteXmlFile>
 		<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>
@@ -30,14 +34,14 @@
 						</goals>
 						<configuration>
 							<target>
-								<!-- Create a shell script to run the JAR file
-								with executable permission -->
-								<chmod file="${project.build.directory}/*.jar" perm="ugo+rx" />
+								<chmod file="${project.build.directory}/*.jar"
+									perm="ugo+rx" />
 							</target>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.0</version>
@@ -47,6 +51,7 @@
 					<argLine>-Dfile.encoding=UTF-8</argLine>
 				</configuration>
 			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
@@ -57,21 +62,15 @@
 							<goal>shade</goal>
 						</goals>
 						<configuration>
-							<finalName>
-								dslrig-ivv-orchestrator-1.2.1-java21-SNAPSHOT-jar-with-dependencies</finalName>
+							<finalName>dslrig-ivv-orchestrator-1.2.1-SNAPSHOT-jar-with-dependencies</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.dslrig.ivv.orchestrator.TestRunner</mainClass>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>io.mosip.testrig.dslrig.ivv.orchestrator.TestRunner</mainClass>
 								</transformer>
 							</transformers>
-							<!-- add this to prevent some security issues when
-							merging everything 
-								together -->
 							<filters>
 								<filter>
 									<artifact>*:*</artifact>
@@ -90,28 +89,30 @@
 	</build>
 
 	<dependencies>
-		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
-		<!--   core dependencies     -->
+
 		<dependency>
 			<groupId>io.mosip.testrig.dslrig.ivv.core</groupId>
 			<artifactId>dslrig-ivv-core</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
+
 		<dependency>
 			<groupId>io.mosip.testrig.dslrig.ivv.dg</groupId>
 			<artifactId>dslrig-ivv-dg</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
+
 		<dependency>
 			<groupId>com.aventstack</groupId>
 			<artifactId>extentreports</artifactId>
 			<version>3.0.7</version>
 			<scope>compile</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
 			<artifactId>apitest-commons</artifactId>
@@ -127,31 +128,37 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
 		<dependency>
-			<groupId>io.mosip.authentication</groupId>
-			<artifactId>apitest-auth</artifactId>
+			<groupId>io.mosip.idrepo</groupId>
+			<artifactId>apitest-idrepo</artifactId>
 			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
-        	<dependency>
+
+		<dependency>
 			<groupId>io.mosip.esignet</groupId>
 			<artifactId>apitest-esignet</artifactId>
 			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
+
 		<dependency>
-			<groupId>io.mosip.masterdata</groupId>
-			<artifactId>apitest-masterdata</artifactId>
+			<groupId>io.mosip.authentication</groupId>
+			<artifactId>apitest-auth</artifactId>
 			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
+
 		<dependency>
-			<groupId>io.mosip.idrepo</groupId>
-			<artifactId>apitest-idrepo</artifactId>
+			<groupId>io.mosip.masterdata</groupId>
+			<artifactId>apitest-masterdata</artifactId>
 			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
+
 		<dependency>
 			<groupId>io.mosip.resident</groupId>
 			<artifactId>apitest-resident</artifactId>
 			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
+
 		<dependency>
 			<groupId>com.slack.api</groupId>
 			<artifactId>slack-api-client</artifactId>
@@ -163,20 +170,23 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-biometrics-api</artifactId>
 			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/javax.cache/cache-api -->
+
 		<dependency>
 			<groupId>javax.cache</groupId>
 			<artifactId>cache-api</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.ehcache</groupId>
 			<artifactId>jcache</artifactId>
@@ -188,10 +198,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-batch</artifactId>
@@ -202,10 +214,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
 		<dependency>
 			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>com.jayway.jsonpath</groupId>
 			<artifactId>json-path</artifactId>
@@ -234,30 +248,12 @@
 		<profile>
 			<id>sonar</id>
 			<properties>
-
-				<!-- Spring version -->
 				<spring.version>5.0.6.RELEASE</spring.version>
-
 				<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>
-
-				<sonar.sources>.</sonar.sources>
-				<sonar.inclusions>src/main/java/**,src/main/resources/**</sonar.inclusions>
-				<sonar.exclusions>${sonar.coverage.exclusions}</sonar.exclusions>
-				<sonar.host.url>https://sonarcloud.io</sonar.host.url>
+				<spring-cloud-config.version>2.0.1.RELEASE</spring-cloud-config.version>
 			</properties>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
 			<build>
 				<plugins>
 					<plugin>
@@ -266,7 +262,6 @@
 						<version>${maven.sonar.plugin.version}</version>
 						<executions>
 							<execution>
-								<phase>verify</phase>
 								<goals>
 									<goal>sonar</goal>
 								</goals>

diff --git a/mosip-acceptance-tests/ivv-parser/pom.xml b/mosip-acceptance-tests/ivv-parser/pom.xml
@@ -5,19 +5,19 @@
 	<parent>
 		<groupId>io.mosip.testrig.dslrig.ivv</groupId>
 		<artifactId>dslrig-ivv-parent</artifactId>
-		<version>1.2.1-java21-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mosip.testrig.dslrig.ivv.parser</groupId>
 	<artifactId>dslrig-ivv-parser</artifactId>
-	<version>1.2.1-java21-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<dependencies>
 		<dependency>
 			<groupId>io.mosip.testrig.dslrig.ivv.core</groupId>
 			<artifactId>dslrig-ivv-core</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/mosip-acceptance-tests/pom.xml b/mosip-acceptance-tests/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>io.mosip.testrig.dslrig.ivv</groupId>
 	<artifactId>dslrig-ivv-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.2.1-java21-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<licenses>
 		<license>
 			<name>MPL 2.0</name>
@@ -203,7 +203,7 @@
 			<dependency>
 				<groupId>io.mosip.kernel</groupId>
 				<artifactId>kernel-bom</artifactId>
-				<version>1.2.1-java21-SNAPSHOT</version>
+				<version>1.2.1-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/mosip-packet-creator/pom.xml b/mosip-packet-creator/pom.xml
@@ -35,15 +35,15 @@
 
 	<groupId>io.mosip.testrig.dslrig.packetcreator</groupId>
 	<artifactId>dslrig-packetcreator</artifactId>
-	<version>1.2.1-java21-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<name>dslrig-packetcreator</name>
 	<description>dslrig-packetcreator</description>
 
 	<properties>
 		<java.version>21</java.version>
 		<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>
 		<spring-cloud.version>2023.0.1</spring-cloud.version>
-		<kernel.core.version>1.2.1-java21-SNAPSHOT</kernel.core.version>
+		<kernel.core.version>1.2.1-SNAPSHOT</kernel.core.version>
 	</properties>
 
 	<dependencies>
@@ -136,7 +136,7 @@
 		<dependency>
 			<groupId>io.mosip.testrig.dslrig.dataprovider</groupId>
 			<artifactId>dslrig-dataprovider</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 			<exclusions>
 				<exclusion>
 					<groupId>io.mosip.kernel</groupId>
@@ -236,7 +236,7 @@
 			<dependency>
 				<groupId>io.mosip.kernel</groupId>
 				<artifactId>kernel-bom</artifactId>
-				<version>1.2.1-java21-SNAPSHOT</version>
+				<version>1.2.1-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/mosipTestDataProvider/pom.xml b/mosipTestDataProvider/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mosip.testrig.dslrig.dataprovider</groupId>
 	<artifactId>dslrig-dataprovider</artifactId>
-	<version>1.2.1-java21-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 	<properties>
 		<maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version>
 	</properties>
@@ -49,7 +49,7 @@
 			<dependency>
 				<groupId>io.mosip.kernel</groupId>
 				<artifactId>kernel-bom</artifactId>
-				<version>1.2.1-java21-SNAPSHOT</version>
+				<version>1.2.1-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -243,7 +243,7 @@
 		<dependency>
 			<groupId>io.mosip.biometric.util</groupId>
 			<artifactId>biometrics-util</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openpnp</groupId>