MOSIP-32842 Pom changes for java 21 migration

Signed-off-by: kameshsr <[email protected]>
kameshsr · May 7, 2024 · d061daa · d061daa
1 parent f484c7e
commit d061daa
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 24 deletions.
diff --git a/partner/partner-management-service/pom.xml b/partner/partner-management-service/pom.xml
@@ -5,18 +5,18 @@
 	<parent>
 		<artifactId>pms-parent</artifactId>
 		<groupId>io.mosip.pms</groupId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.1-java21-SNAPSHOT</version>
 	</parent>
 
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.1-java21-SNAPSHOT</version>
 	<artifactId>partner-management-service</artifactId>
 	<name>partner-management-service</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-openid-bridge-api</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1-java21-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -32,7 +32,7 @@
 		<dependency>
 			<groupId>io.mosip.pms</groupId>
 			<artifactId>pms-common</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1-java21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -115,7 +115,7 @@
 				<dependency>
 					<groupId>io.mosip.kernel</groupId>
 					<artifactId>kernel-auth-adapter</artifactId>
-					<version>${project.version}</version>
+					<version>1.2.0.1</version>
 				</dependency>
 				<dependency>
 					<groupId>com.h2database</groupId>

diff --git a/partner/pms-common/pom.xml b/partner/pms-common/pom.xml
@@ -6,10 +6,10 @@
   <parent>
     <groupId>io.mosip.pms</groupId>
     <artifactId>pms-parent</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1-java21-SNAPSHOT</version>
   </parent>   
   <artifactId>pms-common</artifactId>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1-java21-SNAPSHOT</version>
   <name>pms-common</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -21,7 +21,7 @@
   	   <dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-openid-bridge-api</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1-java21-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
   		<dependency>

diff --git a/partner/policy-management-service/pom.xml b/partner/policy-management-service/pom.xml
@@ -5,28 +5,28 @@
 	<parent>
 		<artifactId>pms-parent</artifactId>
 		<groupId>io.mosip.pms</groupId>
-		<version>1.2.1-SNAPSHOT</version>
+		<version>1.2.1-java21-SNAPSHOT</version>
 	</parent>
 
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.1-java21-SNAPSHOT</version>
 	<artifactId>policy-management-service</artifactId>
 	<name>policy-management-service</name>
 	<dependencies>
 	   <dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-openid-bridge-api</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1-java21-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.mosip.pms</groupId>
 			<artifactId>policy-validator</artifactId>
-            <version>1.2.1-SNAPSHOT</version>			
+            <version>1.2.1-java21-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>io.mosip.pms</groupId>
 			<artifactId>pms-common</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1-java21-SNAPSHOT</version>
 		</dependency>		
 		<dependency>
 			<groupId>io.micrometer</groupId>
@@ -123,7 +123,7 @@
 				<dependency>
 					<groupId>io.mosip.kernel</groupId>
 					<artifactId>kernel-auth-adapter</artifactId>
-					<version>${project.version}</version>
+					<version>1.2.0.1</version>
 				</dependency>
 				<dependency>
 					<groupId>com.h2database</groupId>

diff --git a/partner/policy-validator/pom.xml b/partner/policy-validator/pom.xml
@@ -6,10 +6,10 @@
   <parent>
     <groupId>io.mosip.pms</groupId>
     <artifactId>pms-parent</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1-java21-SNAPSHOT</version>
   </parent>   
   <artifactId>policy-validator</artifactId>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1-java21-SNAPSHOT</version>
   <name>policy-validator</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/partner/pom.xml b/partner/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>io.mosip.pms</groupId>
 	<artifactId>pms-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>1.2.1-SNAPSHOT</version>
+	<version>1.2.1-java21-SNAPSHOT</version>
 
 	<name>partner-management-services</name>
 	<description>Parent project of MOSIP partner-management-services</description>
@@ -67,15 +67,15 @@
 	</distributionManagement>	
 
 	<properties>
-		<kernel.version>1.2.1-SNAPSHOT</kernel.version>		
-		<kernel-dataaccess-hibernate.version>1.2.1-SNAPSHOT</kernel-dataaccess-hibernate.version>
-		<kernel-websubclient-api.version>1.2.1-SNAPSHOT</kernel-websubclient-api.version>
-		<kernel.templatemanager.velocity.version>1.2.1-SNAPSHOT</kernel.templatemanager.velocity.version>
+		<kernel.version>1.2.1-java21-SNAPSHOT</kernel.version>
+		<kernel-dataaccess-hibernate.version>1.2.1-java21-SNAPSHOT</kernel-dataaccess-hibernate.version>
+		<kernel-websubclient-api.version>1.2.1-java21-SNAPSHOT</kernel-websubclient-api.version>
+		<kernel.templatemanager.velocity.version>1.2.1-java21-SNAPSHOT</kernel.templatemanager.velocity.version>
 		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
 		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
-		<maven.compiler.version>3.8.0</maven.compiler.version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
+		<maven.compiler.version>3.9.6</maven.compiler.version>
 		<junit.version>4.12</junit.version>
 		<lombok.version>1.18.8</lombok.version>
 		<doclint>none</doclint>		
@@ -146,6 +146,10 @@
 		    <artifactId>javassist</artifactId>
 		    <version>3.27.0-GA</version>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+		</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>
@@ -169,6 +173,13 @@
 				<artifactId>jackson-datatype-jsr310</artifactId>
 				<version>2.12.0</version>
 			</dependency>
+			<dependency>
+				<groupId>io.mosip.kernel</groupId>
+				<artifactId>kernel-bom</artifactId>
+				<version>1.2.1-java21-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>	
 	<build>