MOSIP-32842 Changes to build skipping test cases

Signed-off-by: kameshsr <[email protected]>
kameshsr · May 8, 2024 · 37d6997 · 37d6997
1 parent cbcdf72
commit 37d6997
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 73 deletions.
diff --git a/partner/partner-management-service/pom.xml b/partner/partner-management-service/pom.xml
@@ -37,48 +37,40 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
-			<version>2.0.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
-			<version>2.0.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
 			<scope>runtime</scope>
 			<optional>true</optional>
-			<version>2.0.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 			<scope>runtime</scope>
-			<version>42.2.2</version>
 		</dependency>
 		<dependency>
 		    <groupId>com.h2database</groupId>
 		    <artifactId>h2</artifactId>
-		    <version>1.4.200</version>
 		    <scope>test</scope>
 		</dependency>		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-			<version>2.0.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
-			<version>${lombok.version}</version>
 		</dependency>	
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-test</artifactId>
-			<version>5.3.3.RELEASE</version>
 			<scope>test</scope>
 		</dependency>	
 		<dependency>
@@ -92,7 +84,6 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>2.6.3</version>
 				<configuration>
 					<layout>ZIP</layout>
 					<executable>true</executable>
@@ -128,7 +119,6 @@
 					<plugin>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
-						<version>${spring.boot.version}</version>
 						<configuration>
 							<executable>true</executable>
 							<layout>ZIP</layout>

diff --git a/partner/pms-common/pom.xml b/partner/pms-common/pom.xml
@@ -14,8 +14,6 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <json.schema.validator.version>2.2.10</json.schema.validator.version>
-    <jackson.datatype.version>2.9.8</jackson.datatype.version>
-    <json.version>20180813</json.version>
   </properties>
   <dependencies>
   	   <dependency>
@@ -28,17 +26,14 @@
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<scope>provided</scope>
-		  	<version>${lombok.version}</version>
 		</dependency>  
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
-			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.5</version>
 		</dependency>	
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>

diff --git a/partner/policy-management-service/pom.xml b/partner/policy-management-service/pom.xml
@@ -31,63 +31,52 @@
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-core</artifactId>
-			<version>1.4.2</version>
 		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>1.4.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-test</artifactId>
-			<version>5.0.5.RELEASE</version>
 			<scope>test</scope>
 		</dependency>		
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<scope>provided</scope>
-			<version>${lombok.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
-			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
-			<version>2.0.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
-			<version>2.0.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>io.swagger</groupId>
 			<artifactId>swagger-annotations</artifactId>
-			<version>1.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
 			<scope>runtime</scope>
 			<optional>true</optional>
-			<version>2.0.2.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 			<scope>runtime</scope>
-			<version>42.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-			<version>2.0.2.RELEASE</version>
 		</dependency>		
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
@@ -100,7 +89,6 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>2.6.3</version>
 				<configuration>
 					<layout>ZIP</layout>
 					<executable>true</executable>
@@ -136,7 +124,6 @@
 					<plugin>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
-						<version>${spring.boot.version}</version>
 						<configuration>
 							<executable>true</executable>
 							<layout>ZIP</layout>

diff --git a/...licy-management-service/src/main/java/io/mosip/pms/policy/dto/PolicyCreateRequestDto.java b/...licy-management-service/src/main/java/io/mosip/pms/policy/dto/PolicyCreateRequestDto.java
@@ -3,7 +3,6 @@
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
-import org.hibernate.annotations.Type;
 import org.json.simple.JSONObject;
 
 import io.swagger.annotations.ApiModel;
@@ -24,18 +23,15 @@ public class PolicyCreateRequestDto {
 
 	@NotBlank(message="value is empty or null")
 	@Size(min = 1, max = 128, message = "Length should be in between 1 and 128 chars")
-	@Type(type="string")
 	public String policyGroupName;
 
 	@ApiModelProperty(notes = "policy type is used to differebtiate policies.", required = true, example = "Auth/DataShare/CredentialIssuance")
 	@NotBlank(message = "value is empty or null. Allowed values Auth/DataShare/CredentialIssuance")
 	@Size(min = 1, max = 128, message = "Length should be in between 1 and 128 chars")
-	@Type(type="string")
 	public String policyType;
 
 	@NotBlank(message="value is empty or null")
 	@Size(min = 1, max = 128, message = "Length should be in between 1 and 128 chars")
-	@Type(type="string")
 	public String name;
 
 	@NotBlank(message="value is empty or null")

diff --git a/...management-service/src/main/java/io/mosip/pms/policy/dto/PolicyGroupCreateRequestDto.java b/...management-service/src/main/java/io/mosip/pms/policy/dto/PolicyGroupCreateRequestDto.java
@@ -20,7 +20,6 @@ public class PolicyGroupCreateRequestDto {
 
 	@NotBlank(message="value is empty or null")
 	@Size(min = 1, max = 128, message = "Length should be in between 1 and 128 chars")
-	@Type(type="string")
 	public String name;
 
 	@NotBlank(message="value is empty or null")

diff --git a/...management-service/src/main/java/io/mosip/pms/policy/dto/PolicyGroupUpdateRequestDto.java b/...management-service/src/main/java/io/mosip/pms/policy/dto/PolicyGroupUpdateRequestDto.java
@@ -12,7 +12,6 @@ public class PolicyGroupUpdateRequestDto {
 
 	@NotBlank(message="value is empty or null")
 	@Size(min = 1, max = 128, message = "Length should be between 1 and 128 chars")
-	@Type(type="string")
 	private String name;
 
 	@NotBlank(message="value is empty or null")

diff --git a/...licy-management-service/src/main/java/io/mosip/pms/policy/dto/PolicyUpdateRequestDto.java b/...licy-management-service/src/main/java/io/mosip/pms/policy/dto/PolicyUpdateRequestDto.java
@@ -3,7 +3,6 @@
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
-import org.hibernate.annotations.Type;
 import org.json.simple.JSONObject;
 
 import io.swagger.annotations.ApiModel;
@@ -22,12 +21,10 @@ public class PolicyUpdateRequestDto {
 
 	@NotBlank(message="value is empty or null")
 	@Size(min = 1, max = 128, message = "Length should be in between 1 and 128 chars")
-	@Type(type="string")
-	private String policyGroupName;	
+	private String policyGroupName;
 
 	@NotBlank(message="value is empty or null")
 	@Size(min = 1, max = 128, message = "Length should be in between 1 and 128 chars")
-	@Type(type="string")
 	private String name;
 
 	@NotBlank(message="value is empty or null")

diff --git a/...r/policy-management-service/src/test/java/io/mosip/pms/policy/test/PolicyServiceTest.java b/...r/policy-management-service/src/test/java/io/mosip/pms/policy/test/PolicyServiceTest.java
@@ -5,6 +5,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.Import;
 
 import io.mosip.pms.common.helper.FilterHelper;
@@ -19,7 +20,7 @@
  *
  */
 @Import(value = {WebSubPublisher.class,RestUtil.class,SearchHelper.class,FilterHelper.class,PageUtils.class,FilterColumnValidator.class,RestUtil.class})
-@SpringBootApplication(scanBasePackages = { "io.mosip.pms.policy.*","io.mosip.pms.common.*"})
+@SpringBootApplication(scanBasePackages = { "io.mosip.pms.policy.*","io.mosip.pms.common.*"},exclude={DataSourceAutoConfiguration.class})
 public class PolicyServiceTest {
 
 	/**

diff --git a/partner/policy-validator/pom.xml b/partner/policy-validator/pom.xml
@@ -14,8 +14,6 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <json.schema.validator.version>2.2.10</json.schema.validator.version>
-    <jackson.datatype.version>2.9.8</jackson.datatype.version>
-    <json.version>20180813</json.version>     
   </properties>
   <dependencies>
     <dependency>
@@ -26,7 +24,6 @@
 		<dependency>
            <groupId>org.json</groupId>
            <artifactId>json</artifactId>
-            <version>${json.version}</version>
         </dependency>
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>