diff --git a/admin/admin-service/pom.xml b/admin/admin-service/pom.xml index 935d8c46301..337aac353eb 100644 --- a/admin/admin-service/pom.xml +++ b/admin/admin-service/pom.xml @@ -7,18 +7,18 @@ io.mosip.admin admin-parent - 1.3.0-beta.2 + 1.3.1-SNAPSHOT admin-service admin-service - 1.3.0-beta.2 + 1.3.1-SNAPSHOT http://maven.apache.org jar UTF-8 1.8.0 - 1.3.0-beta.2 - 1.3.0-beta.2 + 1.3.1-SNAPSHOT + 1.2.2-SNAPSHOT 21 21 3.8.0 @@ -29,8 +29,8 @@ 3.7.0.1746 2.3 2.22.0 - 1.3.0-beta.1 - 1.3.0-beta.1 + 1.3.1-SNAPSHOT + 1.3.1-SNAPSHOT 3.1.1 0.7.0 @@ -226,6 +226,12 @@ bcutil-jdk18on 1.78.1 + + com.h2database + h2 + 2.2.224 + test + - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.1 + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.3.1-SNAPSHOT 3.1.1 @@ -98,7 +98,7 @@ io.mosip.kernel kernel-core - ${kernel-core.version} + ${kernel.core.version} com.fasterxml.jackson.datatype diff --git a/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java b/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java index 7f6c15ffa74..af5f102885b 100644 --- a/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java +++ b/admin/hotlist-service/src/test/java/io/mosip/hotlist/builder/AuditRequestBuilderTest.java @@ -4,6 +4,7 @@ import io.mosip.hotlist.constant.AuditModules; import io.mosip.hotlist.dto.AuditRequestDTO; import io.mosip.kernel.core.http.RequestWrapper; +import io.mosip.kernel.core.util.DateUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -19,6 +20,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; +import java.time.LocalDateTime; import static org.junit.Assert.assertEquals; @@ -47,7 +49,9 @@ public void before() { public void testBuildRequest() { RequestWrapper actualRequest = auditBuilder.buildRequest(AuditModules.HOTLIST_SERVICE, AuditEvents.BLOCK_REQUEST, "id", "RID", "desc"); - actualRequest.getRequest().setActionTimeStamp(null); + LocalDateTime utcNow = DateUtils.getUTCCurrentDateTime(); + actualRequest.getRequest().setActionTimeStamp(utcNow); + AuditRequestDTO expectedRequest = new AuditRequestDTO(); try { InetAddress inetAddress = InetAddress.getLocalHost(); @@ -55,7 +59,7 @@ public void testBuildRequest() { expectedRequest.setEventId(AuditEvents.BLOCK_REQUEST.getEventId()); expectedRequest.setEventName(AuditEvents.BLOCK_REQUEST.getEventName()); expectedRequest.setEventType(AuditEvents.BLOCK_REQUEST.getEventType()); - expectedRequest.setActionTimeStamp(null); + expectedRequest.setActionTimeStamp(utcNow); expectedRequest.setHostName(inetAddress.getHostName()); expectedRequest.setHostIp(inetAddress.getHostAddress()); expectedRequest.setApplicationId("HOTLIST"); diff --git a/admin/kernel-masterdata-service/pom.xml b/admin/kernel-masterdata-service/pom.xml index ca7546b3f06..4b4969693bc 100644 --- a/admin/kernel-masterdata-service/pom.xml +++ b/admin/kernel-masterdata-service/pom.xml @@ -9,7 +9,7 @@ kernel-masterdata-service Mosip commons project https://github.com/mosip/commons - 1.3.0-beta.2 + 1.3.1-SNAPSHOT UTF-8 @@ -108,12 +108,12 @@ 1.4.2 UTF-8 0.7.0 - 1.3.0-beta.2 - 1.3.0-beta.2 + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT 0.3.0 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.1 + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.3.1-SNAPSHOT 3.1.1 diff --git a/admin/kernel-syncdata-service/pom.xml b/admin/kernel-syncdata-service/pom.xml index a859d234466..6c60b5b0000 100644 --- a/admin/kernel-syncdata-service/pom.xml +++ b/admin/kernel-syncdata-service/pom.xml @@ -7,7 +7,7 @@ kernel-syncdata-service Mosip commons project https://github.com/mosip/commons - 1.3.0-beta.2 + 1.3.1-SNAPSHOT UTF-8 @@ -81,12 +81,12 @@ 1.4.2 UTF-8 0.7.0 - 1.3.0-beta.2 - 1.3.0-beta.1 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.2 - 1.3.0-beta.2 + 1.2.2-SNAPSHOT + 1.3.1-SNAPSHOT + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT + 1.2.2-SNAPSHOT 3.1.1 diff --git a/admin/pom.xml b/admin/pom.xml index 5b9287f31a2..bd369cd672f 100644 --- a/admin/pom.xml +++ b/admin/pom.xml @@ -6,7 +6,7 @@ io.mosip.admin admin-parent - 1.3.0-beta.2 + 1.3.1-SNAPSHOT pom admin @@ -163,8 +163,8 @@ 1.9.12 0.6.0 2.0.0.AM2 - 1.3.0-beta.2 - 1.3.0-beta.1 + 1.2.2-SNAPSHOT + 1.3.1-SNAPSHOT **/repositories/**,**/constant/**,**/config/**,**/httpfilter/**,**/cache/**,**/dto/**,**/entity/**,**/model/**,**/exception/**,**/repository/**,**/security/**,**/*Config.java,**/*BootApplication.java,**/*VertxApplication.java,**/cbeffutil/**,**/*Util.java,**/helper/beans/**,**/OptionalFilter.java,**/*Enum.java,**/validator.registereddevice/**,**/DeviceProvider*.java,**/DeviceRegister*.java,**/FoundationalTrustProvider*.java,**/GenderType*.java,**/IndividualType*.java,**/MOSIPDeviceService*.java,**/RegisteredDevice*.java,**/RegistrationCenterDeviceHistoryServiceImpl.java,**/RegistrationCenterMachineUserServiceHistoryImpl.java **/dto/**,**/entity/**,**/config/** @@ -201,7 +201,7 @@ io.mosip.kernel kernel-logger-logback - ${kernel.core.version} + 1.3.0-beta.2 diff --git a/api-test/pom.xml b/api-test/pom.xml index 1c7971e9487..1bd898611a2 100644 --- a/api-test/pom.xml +++ b/api-test/pom.xml @@ -8,7 +8,7 @@ apitest-masterdata Parent project of MOSIP Admin Services apitests https://github.com/mosip/admin-services - 1.3.0-beta.2 + 1.3.1-SNAPSHOT