Skip to content

Commit

Permalink
MOSIP-38646 - Sync the develop branch with release-1.3.0 branch
Browse files Browse the repository at this point in the history
Signed-off-by: Mohanachandran S <[email protected]>
  • Loading branch information
mohanachandran-s committed Jan 3, 2025
1 parent d336086 commit 9b2ee64
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
12 changes: 6 additions & 6 deletions apitest-commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<properties>
<!-- kernel versions -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kernel-websubclient-api.version>1.2.1-SNAPSHOT</kernel-websubclient-api.version>
<kernel-websubclient-api.version>1.3.0-beta.1</kernel-websubclient-api.version>

<!-- maven -->
<maven.compiler.target>21</maven.compiler.target>
Expand All @@ -59,7 +59,7 @@

<!-- automationtests version -->
<wink-json4j-provider.version>1.1.2-incubating</wink-json4j-provider.version>
<kernel.version>1.2.1-SNAPSHOT</kernel.version>
<kernel.version>1.3.0-beta.1</kernel.version>
<zjsonpatch.version>0.4.7</zjsonpatch.version>
<extentreports.aventstack.version>3.0.0</extentreports.aventstack.version>
<extentreports.relevantcodes.version>2.41.2</extentreports.relevantcodes.version>
Expand Down Expand Up @@ -377,7 +377,7 @@
<dependency>
<groupId>io.mosip.mock.mds</groupId>
<artifactId>mock-mds</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.3.0-beta.1</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
Expand Down Expand Up @@ -437,13 +437,13 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-templatemanager-velocity</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.3.0-beta.1</version>
</dependency>

<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-keymanager-service</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.3.0-beta.1</version>
<classifier>lib</classifier>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -482,7 +482,7 @@
<dependency>
<groupId>io.mosip.kernel</groupId>
<artifactId>kernel-bom</artifactId>
<version>1.2.1-SNAPSHOT</version>
<version>1.3.0-beta.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ public String constractBioIdentityRequest(String identityRequest, String bioValu
String transactionId = JsonPrecondtion.getValueFromJson(data, GlobalConstants.TRANSACTIONID);
String encryptedContent = encryptIsoBioValue(bioValue, timestamp, bioValueencryptionTemplateJson,
transactionId, isInternal);
String encryptedBioValue = JsonPrecondtion.getValueFromJson(encryptedContent, "encryptedData");

String encryptedBioValue = JsonPrecondtion.getValueFromJson(encryptedContent, "encryptedData");
logger.info(identityRequest);
String encryptedSessionKey = JsonPrecondtion.getValueFromJson(encryptedContent, "encryptedSessionKey");
identityRequest = JsonPrecondtion.parseAndReturnJsonContent(identityRequest, encryptedBioValue,
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
</properties>

<modules>
<module>authentication-demo-service</module>
<module>apitest-commons</module>
</modules>

<build>
Expand Down Expand Up @@ -283,4 +283,4 @@
</build>
</profile>
</profiles>
</project>
</project>

0 comments on commit 9b2ee64

Please sign in to comment.