Skip to content

Commit

Permalink
Resolved merge conflicts
Browse files Browse the repository at this point in the history 
Signed-off-by: Mohanachandran S <[email protected]>
  • Loading branch information
@mohanachandran-s
mohanachandran-s committed Sep 11, 2024
2 parents 8a11fd6 + 315fb2f commit 7b5f923
Show file tree
Hide file tree
Showing 12 changed files with 65 additions and 28 deletions.
4 changes: 2 additions & 2 deletions admin/admin-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.5</version>
<version>5.3.0</version>
</dependency>
<dependency>
<groupId>org.springframework.batch.extensions</groupId>
Expand Down Expand Up @@ -140,7 +140,7 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>io.mosip.commons</groupId>
Expand Down
4 changes: 2 additions & 2 deletions admin/hotlist-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<!-- common properties -->
<java.version>21</java.version>
<postgresql.version>42.2.2</postgresql.version>
<postgresql.version>42.3.3</postgresql.version>
<maven.jacoco.version>0.8.11</maven.jacoco.version>
<maven.javadoc.version>3.2.0</maven.javadoc.version>

Expand Down Expand Up @@ -188,7 +188,7 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
</dependency>
</dependencies>
<distributionManagement>
Expand Down
2 changes: 1 addition & 1 deletion admin/kernel-masterdata-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...ata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/HolidayServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public class HolidayServiceImpl implements HolidayService {
@Autowired
private AuditUtil auditUtil;

private static final String UPDATE_HOLIDAY_QUERY = "UPDATE Holiday h SET h.updatedBy = :updatedBy , h.updatedDateTime = :updatedDateTime, h.holidayDesc = :holidayDesc,h.holidayId.holidayDate=:holidayDate,h.holidayId.holidayName = :holidayName WHERE h.holidayId.locationCode = :locationCode and h.holidayId.holidayId = :holidayId and h.holidayId.langCode = :langCode and (h.isDeleted is null or h.isDeleted = false)";
private static final String UPDATE_HOLIDAY_QUERY = "UPDATE Holiday h SET h.updatedBy = :updatedBy , h.updatedDateTime = :updatedDateTime, h.holidayDesc = :holidayDesc, h.holidayDate= :holidayDate, h.holidayName = :holidayName WHERE h.locationCode = :locationCode and h.holidayId = :holidayId and h.langCode = :langCode and (h.isDeleted is null or h.isDeleted = false)";
private static final int DEFAULT_HOLIDAY_ID = 2000001;

/*
Expand Down
2 changes: 1 addition & 1 deletion admin/kernel-syncdata-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.5.0</version>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
31 changes: 14 additions & 17 deletions apitest/src/main/resources/config/Kernel.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,17 @@ AuthClientID = mosip-resident-client

#---------------------------------- Client Secret Keys -----------------------#
#-- When test rig ran in docker, these values dervied from the environment ---#
mosip_partner_client_secret = vXS7WUyPDpfWYuoz
mosip_pms_client_secret = 5Qj8vn989OL1Vlu6
mosip_resident_client_secret = SnZQ6nnVwN9YWvdM
mosip_idrepo_client_secret = AeM2TwFuuZygCuvO
mosip_reg_client_secret = DLXygc82rkAkjrwV
mosip_admin_client_secret = Styop9nqkshXMTgj
mosip_hotlist_client_secret = TKyc4cqWymxjiLEsVydX4uME1xU3i9xl
mosip_regproc_client_secret = eyeXdyhO0u2ETibw
mpartner_default_mobile_secret = iCkj8BRZU6hP6MAN
mosip_testrig_client_secret = AonuXbikoWmHP5ug
AuthClientSecret = SnZQ6nnVwN9YWvdM
mosip_partner_client_secret =
mosip_pms_client_secret =
mosip_resident_client_secret =
mosip_idrepo_client_secret =
mosip_reg_client_secret =
mosip_admin_client_secret =
mosip_hotlist_client_secret =
mosip_regproc_client_secret =
mpartner_default_mobile_secret =
mosip_testrig_client_secret =
AuthClientSecret =



Expand Down Expand Up @@ -256,6 +256,7 @@ admin_password=mosip123
admin_userName=220005
admin_zone_password=mosip123
admin_zone_userName=globaladmin
mockNotificationChannel=email,phone



Expand All @@ -270,10 +271,6 @@ langselect=0

#----------------------------------AuthDemoService Host properties----------------------------------------------------------#
#Uncommemnt the below to run locally
authDemoServiceBaseURL=http://localhost
authDemoServicePort=8082
authCertsPath=
#authCertsPath=
#Uncommemnt the below to run in Docker
#authDemoServiceBaseURL=http://authdemo.apitestrig
#authDemoServicePort=80
#authCertsPath=/home/mosip/authcerts
authCertsPath=/home/mosip/authcerts
0 ...RegistrationMachineUserMappingHistory.yml → ...registrationmachineusermappinghistory.yml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions apitest/src/main/resources/masterdata/UserCenterMapping/UpdateUserCenterMapping.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ UpdateUserCenterMapping:
"name": "automationUpdated",
"statusCode": "active",
"regCenterId": "$IGNORE$",
"zoneCode": "RBT",
"zoneCode": "$IGNORE$",
"zoneName": "$IGNORE$",
"regCenterName": "HSR Center updated"
}'
Expand Down Expand Up @@ -70,4 +70,4 @@ UpdateUserCenterMapping:
"message": "Registration Center not found"
}
]
}'
}'
20 changes: 20 additions & 0 deletions db_upgrade_scripts/mosip_master/sql/1.2.0.1_to_1.3.0_rollback.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
-- ------------------------------------------------------------------------------------------
-- Rollback script for Migrating Spring batch version to 5.0 as part of Java 21 Migration.
-- ------------------------------------------------------------------------------------------

ALTER TABLE master.BATCH_STEP_EXECUTION DROP COLUMN CREATE_TIME;
ALTER TABLE master.BATCH_STEP_EXECUTION ALTER COLUMN START_TIME SET NOT NULL;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ADD COLUMN DATE_VAL DATE;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ADD COLUMN LONG_VAL BIGINT;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ADD COLUMN DOUBLE_VAL DOUBLE PRECISION;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS RENAME PARAMETER_TYPE TO TYPE_CD;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN TYPE_CD TYPE VARCHAR(6);
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS RENAME PARAMETER_NAME TO KEY_NAME;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN KEY_NAME TYPE VARCHAR(100);
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS RENAME PARAMETER_VALUE TO STRING_VAL;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN STRING_VAL TYPE VARCHAR(250);
ALTER TABLE master.BATCH_JOB_EXECUTION ADD COLUMN JOB_CONFIGURATION_LOCATION VARCHAR(2500);

DROP SEQUENCE master.BATCH_STEP_EXECUTION_SEQ;
DROP SEQUENCE master.BATCH_JOB_EXECUTION_SEQ;
DROP SEQUENCE master.BATCH_JOB_SEQ;
20 changes: 20 additions & 0 deletions db_upgrade_scripts/mosip_master/sql/1.2.0.1_to_1.3.0_upgrade.sql
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
-- ------------------------------------------------------------------------------------------
-- Upgrade script for Migrating Spring batch version to 5.0 as part of Java 21 Migration.
-- ------------------------------------------------------------------------------------------

ALTER TABLE master.BATCH_STEP_EXECUTION ADD CREATE_TIME TIMESTAMP NOT NULL DEFAULT '1970-01-01 00:00:00';
ALTER TABLE master.BATCH_STEP_EXECUTION ALTER COLUMN START_TIME DROP NOT NULL;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DATE_VAL;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS DROP COLUMN LONG_VAL;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS DROP COLUMN DOUBLE_VAL;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN TYPE_CD TYPE VARCHAR(100);
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS RENAME TYPE_CD TO PARAMETER_TYPE;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN KEY_NAME TYPE VARCHAR(100);
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS RENAME KEY_NAME TO PARAMETER_NAME;
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS ALTER COLUMN STRING_VAL TYPE VARCHAR(2500);
ALTER TABLE master.BATCH_JOB_EXECUTION_PARAMS RENAME STRING_VAL TO PARAMETER_VALUE;
ALTER TABLE master.BATCH_JOB_EXECUTION DROP COLUMN JOB_CONFIGURATION_LOCATION;

CREATE SEQUENCE master.BATCH_STEP_EXECUTION_SEQ START WITH 0 MINVALUE 0 MAXVALUE 9223372036854775807 NO CYCLE;
CREATE SEQUENCE master.BATCH_JOB_EXECUTION_SEQ START WITH 0 MINVALUE 0 MAXVALUE 9223372036854775807 NO CYCLE;
CREATE SEQUENCE master.BATCH_JOB_SEQ START WITH 0 MINVALUE 0 MAXVALUE 9223372036854775807 NO CYCLE;
2 changes: 1 addition & 1 deletion deploy/copy_cm.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# DST_NS: Destination namespace

function copying_cm() {
UTIL_URL=https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh
UTIL_URL=https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh
COPY_UTIL=./copy_cm_func.sh
DST_NS=admin

Expand Down
2 changes: 1 addition & 1 deletion deploy/copy_cm_kernel.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# DST_NS: Destination namespace

function copying_cm() {
UTIL_URL=https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh
UTIL_URL=https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh
COPY_UTIL=./copy_cm_func.sh
DST_NS=kernel

Expand Down

0 comments on commit 7b5f923

Please sign in to comment.