Merge branch 'develop-java21' into develop-java21

Signed-off-by: Janardhan B S <72377118+JanardhanBS-SyncByte@users.noreply.github.com>
mosip · May 14, 2024 · 24719d6 · 24719d6
2 parents b8dc6f8 + 10e31d1
commit 24719d6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -35,13 +35,13 @@ jobs:
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
   publish_to_nexus:
-    if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' }}"
+    if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}"
     needs: build-biosdk-services
     uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21
     with:
       SERVICE_LOCATION: ./biosdk-services
     secrets:
-      OSSRH_URL: ${{ secrets.RELEASE_URL }}
+      OSSRH_URL: ${{ secrets.OSSRH_SNAPSHOT_URL }}
       OSSRH_USER: ${{ secrets.OSSRH_USER }}
       OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
       OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}

diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
-[![Maven Package upon a push](https://github.com/mosip/biosdk-services/actions/workflows/push-trigger.yml/badge.svg?branch=master)](https://github.com/mosip/biosdk-services/actions/workflows/push-trigger.yml)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=master&project=mosip_biosdk-services&metric=alert_status)](https://sonarcloud.io/dashboard?branch=master&id=mosip_biosdk-services)
-
+[![Maven Package upon a push](https://github.com/mosip/biosdk-services/actions/workflows/push_trigger.yml/badge.svg?branch=develop-java21)](https://github.com/mosip/biosdk-services/actions/workflows/push_trigger.yml)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=develop&project=mosip_biosdk-services&metric=alert_status)](https://sonarcloud.io/dashboard?branch=develop-java21&id=mosip_biosdk-services)
 
 # Bio-SDK Service
 

diff --git a/biosdk-services/README.md b/biosdk-services/README.md
@@ -23,7 +23,7 @@ java -Dloader.path=<biosdk jar provided by third-party vendors> -Dbiosdk_bioapi_
 
 For example:
 ```text
-java -Dloader.path=mock-sdk.jar -Dbiosdk_bioapi_impl=io.mosip.mock.sdk.impl.SampleSDK  -jar biosdk-services-1.1.3.jar
+java -Dloader.path=mock-sdk-1.2.1-SNAPSHOT-jar-with-dependencies.jar -Dbiosdk_bioapi_impl=io.mosip.mock.sdk.impl.SampleSDKV2 -jar biosdk-services-1.2.1-SNAPSHOT.jar
 ```
 
 ### Check service status

diff --git a/biosdk-services/run.bat b/biosdk-services/run.bat
@@ -0,0 +1 @@
+java -Dloader.path=mock-sdk-1.2.1-SNAPSHOT-jar-with-dependencies.jar -Dbiosdk_bioapi_impl=io.mosip.mock.sdk.impl.SampleSDKV2 -jar target/biosdk-services-1.2.1-SNAPSHOT.jar
diff --git a/biosdk-services/src/main/java/io/mosip/biosdk/services/utils/Utils.java b/biosdk-services/src/main/java/io/mosip/biosdk/services/utils/Utils.java
@@ -311,4 +311,4 @@ private String dateAsString(LocalDateTime localDateTime) {
 	private static String booleanAsString(Boolean bool) {
 		return bool == null ? "null" : Boolean.toString(bool);
 	}
-}
+}