Merge remote-tracking branch 'upstream/develop' into develop

mosip · Oct 25, 2024 · e844640 · e844640
2 parents 3adbde3 + 493fb17
commit e844640
Show file tree

Hide file tree

Showing 10 changed files with 247 additions and 35 deletions.
diff --git a/authentication/authentication-authtypelockfilter-impl/pom.xml b/authentication/authentication-authtypelockfilter-impl/pom.xml
@@ -20,12 +20,9 @@
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
 		<maven.compiler.version>3.8.0</maven.compiler.version>
-		<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->
 
 		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
 		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
-		<!-- <maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version> -->
-		<!-- <maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version> -->
 		<maven.javadoc.version>3.2.0</maven.javadoc.version>
 		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
 
@@ -114,11 +111,11 @@
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
 		<maven.compiler.version>3.8.0</maven.compiler.version>
-		<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->
+	    <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
 
 		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
 		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
-		<!-- <maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version> -->
+	    <jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>
 		<!-- <maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version> -->
 		<maven.javadoc.version>3.2.0</maven.javadoc.version>
 		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
@@ -408,7 +405,39 @@
                         </execution>
                   </executions>
                 </plugin>
-
+			  <plugin>
+				  <groupId>org.apache.maven.plugins</groupId>
+				  <artifactId>maven-surefire-plugin</artifactId>
+				  <version>2.22.0</version>
+				  <configuration>
+					  <skipTests>false</skipTests>
+					  <skip>false</skip>
+					  <argLine>
+						  ${argLine} --add-opens
+						  java.xml/jdk.xml.internal=ALL-UNNAMED
+						  --illegal-access=permit
+					  </argLine>
+				  </configuration>
+			  </plugin>
+			  <plugin>
+				  <groupId>org.jacoco</groupId>
+				  <artifactId>jacoco-maven-plugin</artifactId>
+				  <version>${jacoco.maven.plugin.version}</version>
+				  <executions>
+					  <execution>
+						  <goals>
+							  <goal>prepare-agent</goal>
+						  </goals>
+					  </execution>
+					  <execution>
+						  <id>report</id>
+						  <phase>prepare-package</phase>
+						  <goals>
+							  <goal>report</goal>
+						  </goals>
+					  </execution>
+				  </executions>
+			  </plugin>
               <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/...est/java/io/mosip/authentication/common/service/cache/MasterDataCacheInitializerTest.java b/...est/java/io/mosip/authentication/common/service/cache/MasterDataCacheInitializerTest.java
@@ -2,6 +2,7 @@
 
 import io.mosip.authentication.core.exception.IdAuthUncheckedException;
 import io.mosip.authentication.core.exception.IdAuthenticationBusinessException;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -58,6 +59,7 @@ public void onApplicationEventTest(){
      * @throws IdAuthenticationBusinessException the id authentication business
      *                                           exception
      */
+    @Ignore
     @Test(expected = IdAuthUncheckedException.class)
     public void OnApplicationReadyEventExceptionTest() throws IdAuthenticationBusinessException {
         SpringApplication application = new SpringApplication();

diff --git a/...rc/test/java/io/mosip/authentication/common/service/integration/DataShareManagerTest.java b/...rc/test/java/io/mosip/authentication/common/service/integration/DataShareManagerTest.java
@@ -9,6 +9,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -35,6 +36,7 @@
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class })
 @WebMvcTest
+@Ignore
 public class DataShareManagerTest {
 
 	@Mock

diff --git a/.../test/java/io/mosip/authentication/common/service/util/KeyBindedTokenMatcherUtilTest.java b/.../test/java/io/mosip/authentication/common/service/util/KeyBindedTokenMatcherUtilTest.java
@@ -5,6 +5,7 @@
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemReader;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -83,6 +84,8 @@ public void matchTestWithInValidThumbprint_thenFail()  {
             Assert.assertEquals("IDA-MLC-009",e.getErrorCode());
         }
     }
+
+    @Ignore
     @Test
     public void matchTestWithInValidCerts_thenFail() throws IdAuthenticationBusinessException {
         ReflectionTestUtils.setField(keyBindedTokenMatcherUtil, "iatAdjSeconds", 30000000);

diff --git a/authentication/authentication-filter-api/pom.xml b/authentication/authentication-filter-api/pom.xml
@@ -20,12 +20,11 @@
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
 		<maven.compiler.version>3.8.0</maven.compiler.version>
-		<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->
+	    <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
+	    <jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>
 
 		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
 		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
-		<!-- <maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version> -->
-		<!-- <maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version> -->
 		<maven.javadoc.version>3.2.0</maven.javadoc.version>
 		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
 
@@ -111,12 +110,10 @@
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
 		<maven.compiler.version>3.8.0</maven.compiler.version>
-		<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->
 
 		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
 		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
-		<!-- <maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version> -->
-		<!-- <maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version> -->
+
 		<maven.javadoc.version>3.2.0</maven.javadoc.version>
 		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
 
@@ -346,6 +343,39 @@
                           <doclint>none</doclint>
                   </configuration>
                 </plugin>
+			  <plugin>
+				  <groupId>org.apache.maven.plugins</groupId>
+				  <artifactId>maven-surefire-plugin</artifactId>
+				  <version>2.22.0</version>
+				  <configuration>
+					  <skipTests>false</skipTests>
+					  <skip>false</skip>
+					  <argLine>
+						  ${argLine} --add-opens
+						  java.xml/jdk.xml.internal=ALL-UNNAMED
+						  --illegal-access=permit
+					  </argLine>
+				  </configuration>
+			  </plugin>
+			  <plugin>
+				  <groupId>org.jacoco</groupId>
+				  <artifactId>jacoco-maven-plugin</artifactId>
+				  <version>${jacoco.maven.plugin.version}</version>
+				  <executions>
+					  <execution>
+						  <goals>
+							  <goal>prepare-agent</goal>
+						  </goals>
+					  </execution>
+					  <execution>
+						  <id>report</id>
+						  <phase>prepare-package</phase>
+						  <goals>
+							  <goal>report</goal>
+						  </goals>
+					  </execution>
+				  </executions>
+			  </plugin>
                 <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-gpg-plugin</artifactId>

diff --git a/authentication/authentication-hotlistfilter-impl/pom.xml b/authentication/authentication-hotlistfilter-impl/pom.xml
@@ -20,11 +20,9 @@
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
 		<maven.compiler.version>3.8.0</maven.compiler.version>
-		<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->
 
 		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
 		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
-		<!-- <maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version> -->
 		<!-- <maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version> -->
 		<maven.javadoc.version>3.2.0</maven.javadoc.version>
 		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
@@ -121,12 +119,12 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		<maven.compiler.version>3.8.0</maven.compiler.version>
-		<!-- <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version> -->
+
 
 		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
 		<maven.war.plugin.version>3.1.0</maven.war.plugin.version>
-		<!-- <maven.jacoco.plugin.version>0.8.1</maven.jacoco.plugin.version> -->
-		<!-- <maven.sonar.plugin.version>3.7.0.1746</maven.sonar.plugin.version> -->
+	    <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
+	    <jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>
 		<maven.javadoc.version>3.2.0</maven.javadoc.version>
 		<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
 
@@ -425,6 +423,39 @@
                           <doclint>none</doclint>
                   </configuration>
                 </plugin>
+			  <plugin>
+				  <groupId>org.apache.maven.plugins</groupId>
+				  <artifactId>maven-surefire-plugin</artifactId>
+				  <version>2.22.0</version>
+				  <configuration>
+					  <skipTests>false</skipTests>
+					  <skip>false</skip>
+					  <argLine>
+						  ${argLine} --add-opens
+						  java.xml/jdk.xml.internal=ALL-UNNAMED
+						  --illegal-access=permit
+					  </argLine>
+				  </configuration>
+			  </plugin>
+			  <plugin>
+				  <groupId>org.jacoco</groupId>
+				  <artifactId>jacoco-maven-plugin</artifactId>
+				  <version>${jacoco.maven.plugin.version}</version>
+				  <executions>
+					  <execution>
+						  <goals>
+							  <goal>prepare-agent</goal>
+						  </goals>
+					  </execution>
+					  <execution>
+						  <id>report</id>
+						  <phase>prepare-package</phase>
+						  <goals>
+							  <goal>report</goal>
+						  </goals>
+					  </execution>
+				  </executions>
+			  </plugin>
                 <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-gpg-plugin</artifactId>

diff --git a/authentication/authentication-internal-service/pom.xml b/authentication/authentication-internal-service/pom.xml
@@ -14,6 +14,8 @@
 	<name>authentication-internal-service</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
+		<jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -327,6 +329,39 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>2.22.0</version>
+						<configuration>
+							<skipTests>false</skipTests>
+							<skip>false</skip>
+							<argLine>
+								${argLine} --add-opens
+								java.xml/jdk.xml.internal=ALL-UNNAMED
+								--illegal-access=permit
+							</argLine>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+						<version>${jacoco.maven.plugin.version}</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>prepare-agent</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>report</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>report</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.springdoc</groupId>
 						<artifactId>springdoc-openapi-maven-plugin</artifactId>

diff --git a/authentication/authentication-otp-service/pom.xml b/authentication/authentication-otp-service/pom.xml
@@ -14,6 +14,8 @@
 	<name>authentication-otp-service</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
+		<jacoco.maven.plugin.version>0.8.11</jacoco.maven.plugin.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -201,6 +203,39 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.0</version>
+				<configuration>
+					<skipTests>false</skipTests>
+					<skip>false</skip>
+					<argLine>
+						${argLine} --add-opens
+						java.xml/jdk.xml.internal=ALL-UNNAMED
+						--illegal-access=permit
+					</argLine>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>${jacoco.maven.plugin.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>