Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MOSIP-32507] Updated Pre-reg pom,docker #685

Merged
merged 146 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
e742bd4
updated kernel.keymanager.version in pom
mayuradesh Mar 15, 2022
4c18651
Merge pull request #512 from mayuradesh/my-1.2.0.1
mayuradesh Mar 15, 2022
affd945
[MOSIP-19036] Fixed adding lunch hours and moving lunch hours issue.
mahammedtaheer Mar 15, 2022
3957f78
Merge pull request #514 from mahammedtaheer/1.2.0.1
mayuradesh Mar 15, 2022
d8ec2c8
[MOSIP-20468] Created Specific error code for consumed PRID, [MOSIP-2…
aihamh Mar 15, 2022
4e04b08
Merge pull request #516 from aihamh/1.2.0.1
mayuradesh Mar 15, 2022
706ae41
[MOSIP-20435] Updated unit test for Demographic service
aihamh Mar 16, 2022
1347b38
Merge pull request #518 from aihamh/1.2.0.1
mayuradesh Mar 16, 2022
c88ca9a
[MOSIP-20435] Fixed sonar issues
aihamh Mar 21, 2022
ae4c6b7
Added all changes
aihamh Mar 21, 2022
2bf168e
Updated changes
aihamh Mar 21, 2022
f6f4e37
Merge pull request #524 from aihamh/1.2.0.1
mayuradesh Mar 21, 2022
cfa6199
MOSIP-21214 Added Script to insert record in mosip_prereg application…
kameshsr Apr 8, 2022
4be9e0b
MOSIP-21214 Added Script to insert record in mosip_prereg application…
kameshsr Apr 8, 2022
95596e3
Merge pull request #536 from kameshsr/1.2.0.1
gsasikumar Apr 8, 2022
d3ec5b8
MOSIP-21409 : Changed timestamp to time.
kameshsr Apr 14, 2022
93b9d27
Merge pull request #539 from kameshsr/patch-1
gsasikumar Apr 18, 2022
ec95679
[MOSIP-20020] Update release_changes.yml
ckm007 May 12, 2022
1aa3e60
Merge pull request #550 from mosip/ckm007-patch-1
syedsalman3753 May 12, 2022
463d495
[ MOSIP-20021 ] updated release_changes.yml to update README.md badges
May 19, 2022
3acad22
Merge pull request #552 from syed-salman-technoforte/1.2.0.1
ckm007 May 20, 2022
383b0d1
[MOSIP-20028] added action for tagging
ckm007 Jul 18, 2022
b51ae5b
DB release script re-structurisation changes
mayuradesh Aug 16, 2022
c4a4d8a
Merge pull request #572 from mayuradesh/my-1.2.0.1
ckm007 Aug 18, 2022
600d546
MOSIP-23623 Added revoke.sql
kameshsr Aug 19, 2022
caaa435
Merge pull request #573 from kameshsr/release-1.2.0.1
ckm007 Aug 19, 2022
11ba14d
MOSIP-23854 ref to pre_registration_transaction
mayuradesh Sep 5, 2022
89ca636
Merge pull request #575 from mayuradesh/my-1.2.0.1
ckm007 Sep 5, 2022
854bf5a
Release Bot Pre-release changes
pramod444 Sep 29, 2022
accd0aa
Update README.md
ckm007 Sep 29, 2022
fd1924e
Merge pull request #582 from mosip/release-branch
ckm007 Sep 29, 2022
371beef
[MOSIP-24254] reverted pom version
ckm007 Oct 10, 2022
0a54fd1
Merge pull request #583 from ckm007/release-1.2.0.1
ckm007 Oct 10, 2022
6a5c3d7
Mosip 23833 (#595)
ckm007 May 15, 2023
2539d9b
release-1.2.0.1 build failure issue
mayuradesh Jun 7, 2023
ffa2493
Merge pull request #596 from mayuradesh/myrelease-1.2.0.1
gsasikumar Jun 7, 2023
28838e2
MOSIP-23945 bean defination modified
aihamh Jun 8, 2023
8e09532
[MOSIP-27964] Update 1.1.5.5_to_1.2.0.1-B1_upgrade.sql
ckm007 Jun 13, 2023
2807512
Update 1.1.5.5_to_1.2.0.1-B1_rollback.sql
ckm007 Jun 13, 2023
2812a14
[MOSIP-27964]
ckm007 Jun 13, 2023
dc5b1ec
Merge pull request #598 from mosip/ckm007-patch-1
vishwa-vyom Jun 14, 2023
8d2b899
[MOSIP-27964]
ckm007 Jun 15, 2023
21555d6
Merge branch 'release-1.2.0.1' of https://github.com/mosip/pre-regist…
aihamh Jun 15, 2023
f5936d7
[MOSIP-27987] Updated prereg db_upgrade_scripts
aihamh Jun 15, 2023
b8a220d
[MOSIP-28035] Update 1.1.5.5_to_1.2.0.1-B1_rollback.sql (#600)
ckm007 Jun 18, 2023
0eb02e8
[MOSIP-27987] Updated scripts
aihamh Jun 19, 2023
8b4eac1
Updated review changes
aihamh Jun 21, 2023
596a1c6
Merge pull request #597 from aihamh/release-1.2.0.1
vishwa-vyom Jun 21, 2023
89d2e74
[MOSIP-27978] Update 1.1.5.5_to_1.2.0.1-B1_upgrade.sql
ckm007 Jun 22, 2023
a0f6895
Merge pull request #601 from mosip/ckm007-patch-3
vishwa-vyom Jun 22, 2023
1096d31
[MOSIP-28179] Updated internal dependencies
aihamh Jul 3, 2023
92103b1
Merge pull request #602 from aihamh/release-1.2.0.1
vishwa-vyom Jul 3, 2023
ab20a59
[MOSIP-28225] moved ddl statements to upgrade scripts
aihamh Jul 6, 2023
16171de
deleted ddl files
aihamh Jul 6, 2023
19f6f78
[MOSIP-21206] Added support for pre-reg app service also to be a lib
kameshsr Jul 7, 2023
15b379d
Merge pull request #604 from kameshsr/release-1.2.0.1
vishwa-vyom Jul 7, 2023
7a0c57b
[MOSIP-28225] Updated PR as per review
aihamh Jul 7, 2023
82ff8ae
Merge pull request #603 from aihamh/release-1.2.0.1
vishwa-vyom Jul 10, 2023
f768172
Update pom.xml
loganathan-sekaran Jul 12, 2023
d1d3879
Merge pull request #605 from mosip/LoganathanSekar7627-patch-1-exclud…
vishwa-vyom Jul 12, 2023
b322a78
Merge branch 'release-1.2.0.1' into ckm007-patch-2
vishwa-vyom Jul 14, 2023
e8b418f
Merge pull request #599 from mosip/ckm007-patch-2
vishwa-vyom Jul 14, 2023
40de6d3
[MOSIP-23518] Update 1.1.5.5_to_1.2.0.1-B1_upgrade.sql (#607)
ckm007 Jul 16, 2023
8ba6b21
[MOSIP-28488] Update README.md (#608)
Rakshithb1 Jul 17, 2023
c20ff39
[MOSIP-28225] Updated upgrade scripts
aihamh Jul 18, 2023
c70c212
Merge pull request #610 from aihamh/release-1.2.0.1
vishwa-vyom Jul 18, 2023
51bb345
[MOSIP-27966] Update 1.1.5.5_to_1.2.0.1-B1_rollback.sql
ckm007 Jul 25, 2023
4826b6b
Merge pull request #611 from mosip/ckm007-patch-4
vishwa-vyom Jul 25, 2023
e61189c
[MOSIP-28484] Added error handling for deploy.sh script (#617)
akilalakshmanan Aug 22, 2023
38e9e88
[MOSIP-29142] updated workflows as per reusable workflows templates (…
syedsalman3753 Sep 25, 2023
ffbf56a
[MOSIP-29918] added db-test.yml (#628)
Rakshithb1 Nov 24, 2023
06020a9
[MOSIP-29805] Updated Anonymous profile
aihamh Dec 18, 2023
23eebd4
[MOSIP-29805] Updated naming convention
aihamh Dec 19, 2023
4724398
[MOSIP-29805] Rebuilt maven
aihamh Dec 19, 2023
4c29e65
Merge branch 'develop' of https://github.com/mosip/pre-registration i…
aihamh Dec 19, 2023
db05178
[DSD-3932] removed release-changes.yml, tag.yml and updated push-trig…
Prafulrakhade Dec 20, 2023
bcee333
Release changes (#640)
ckm007 Dec 20, 2023
1e2bf0b
[[MOSIP-29961] removed paths from db-test.yml (#642)
Rakshithb1 Jan 2, 2024
5f0a0e2
[MOSIP-29805] Updated Anonymous profile (#634)
aihamh Jan 3, 2024
4b216c2
[DSD-3932] updated push-trigger.yml file (#643)
Prafulrakhade Jan 4, 2024
f50b19c
Merge branch 'release-1.2.0.1' of https://github.com/mosip/pre-regist…
aihamh Jan 4, 2024
b446ff6
[MOSIP-25644] Fixed otp issue
aihamh Jan 4, 2024
7715dda
Merge pull request #644 from aihamh/release-1.2.0.1
vishwa-vyom Jan 5, 2024
877145f
[MOSIP-31071] Added logger to debug
aihamh Jan 16, 2024
db0a010
Merge pull request #645 from aihamh/release-1.2.0.1
mayuradesh Jan 17, 2024
21e39c8
[MOSIP-31199] Updated internal dependency
aihamh Jan 17, 2024
8855dd8
Merge branch 'release-1.2.0.1' of https://github.com/mosip/pre-regist…
aihamh Jan 17, 2024
9783c22
Merge pull request #646 from aihamh/release-1.2.0.1
mayuradesh Jan 17, 2024
1a21d49
[MOSIP-31071] Removed logger
aihamh Jan 17, 2024
f9af6b3
[MOSIP-31202] updated sql file names (#648)
Prafulrakhade Jan 17, 2024
ce622e7
Merge pull request #650 from aihamh/release-1.2.0.1
mayuradesh Jan 17, 2024
7380a42
[DSD-4255] Fixed Nexus failure
aihamh Jan 19, 2024
e1f49df
[DSD-4255] Fixed Nexus failure
aihamh Jan 19, 2024
320facc
[DSD-4255]Update push-trigger.yml (#651)
Rakshitha650 Jan 19, 2024
550f0e1
Merge branch 'release-1.2.0.1' of https://github.com/mosip/pre-regist…
aihamh Feb 27, 2024
dcd060e
[MOSIP-31762] Added db scripts for 1.2.0.1-B3_to_1.2.0.1
aihamh Feb 27, 2024
35244ac
Merge pull request #652 from aihamh/release-1.2.0.1
ckm007 Feb 27, 2024
f08de7f
Updated Pom versions for release changes (#653)
ckm007 Mar 4, 2024
4e9e71f
[MOSIP-31762] Updated db scripts (#654)
aihamh Mar 6, 2024
fa17c60
Merge branch 'develop' of https://github.com/mosip/pre-registration i…
aihamh Mar 25, 2024
44a06ab
Merge branch 'release-1.2.0.1' of https://github.com/mosip/pre-regist…
aihamh Mar 25, 2024
ac30d99
Merge branch 'develop' of https://github.com/mosip/pre-registration i…
aihamh Apr 22, 2024
f9103a6
[MOSIP-32507] Migrated Pre-reg services from Java 11 to Java 21
aihamh May 10, 2024
21edcdb
Merge branch 'develop-java21' of https://github.com/mosip/pre-registr…
aihamh May 10, 2024
bf0674e
Fixed postgres build failure
aihamh May 10, 2024
600a2ec
Updated batchjob db scripts
aihamh May 21, 2024
635d311
Updated db scripts
aihamh May 21, 2024
b154d4a
updated scripts
aihamh May 23, 2024
659f3c8
updated test cases
aihamh Jun 6, 2024
7f2cb15
[Java21]
JanardhanBS-SyncByte Jun 7, 2024
754a8fb
Merge pull request #1 from JanardhanBS-SyncByte/develop-java21_backup
aihamh Jun 10, 2024
7da8f0a
[Java21]
JanardhanBS-SyncByte Jun 10, 2024
adeca0f
[Java21]
JanardhanBS-SyncByte Jun 10, 2024
1fb7fee
Merge pull request #2 from JanardhanBS-SyncByte/develop-java21_backup
aihamh Jun 10, 2024
8462a7c
[Java21]
JanardhanBS-SyncByte Jun 11, 2024
84eb1e4
Merge pull request #3 from JanardhanBS-SyncByte/develop-java21_backup
aihamh Jun 11, 2024
138f9e9
Merge branch 'develop-java21' into develop-java21_backup
aihamh Jun 11, 2024
fdb436d
[Java21]
JanardhanBS-SyncByte Jun 11, 2024
0a5f39b
[Java21]
JanardhanBS-SyncByte Jun 11, 2024
1f0ed19
[Java21]
JanardhanBS-SyncByte Jun 11, 2024
3a1bd9e
Merge pull request #4 from JanardhanBS-SyncByte/develop-java21_backup
aihamh Jun 11, 2024
4181020
[Java21]
JanardhanBS-SyncByte Jun 11, 2024
86723bf
Merge pull request #5 from JanardhanBS-SyncByte/develop-java21_backup
aihamh Jun 11, 2024
85d2a5c
updated test case
aihamh Jun 11, 2024
6dc7645
Merge branch 'develop-java21_backup' of https://github.com/aihamh/pre…
aihamh Jun 11, 2024
592a69e
[Java21]
JanardhanBS-SyncByte Jun 11, 2024
46ddff1
[Java21]
JanardhanBS-SyncByte Jun 11, 2024
973dbb8
Merge pull request #6 from JanardhanBS-SyncByte/develop-java21_backup
aihamh Jun 11, 2024
df589e6
[Java21]
JanardhanBS-SyncByte Jun 11, 2024
73626c2
Merge branch 'develop-java21_backup' of https://github.com/aihamh/pre…
aihamh Jun 11, 2024
46abe7e
Merge pull request #7 from JanardhanBS-SyncByte/develop-java21_backup
aihamh Jun 11, 2024
357543a
Merge branch 'develop-java21_backup' of https://github.com/aihamh/pre…
aihamh Jun 11, 2024
22b0423
Updated code
aihamh Jun 11, 2024
945fae5
[Java21]
JanardhanBS-SyncByte Jun 11, 2024
8aa4e9b
[Java21]
JanardhanBS-SyncByte Jun 11, 2024
eb1329f
[Java21]
JanardhanBS-SyncByte Jun 12, 2024
7eb8a32
Merge pull request #9 from JanardhanBS-SyncByte/develop-java21_backup
aihamh Jun 12, 2024
affd8fb
[Java21]
JanardhanBS-SyncByte Jun 12, 2024
edc41f8
Merge pull request #10 from JanardhanBS-SyncByte/develop-java21_backup
aihamh Jun 13, 2024
554b408
updated
aihamh Jun 13, 2024
8df7a7d
Merge branch 'develop-java21_backup3' of https://github.com/aihamh/pr…
aihamh Jun 13, 2024
47b79d5
[MOSIP-32507] Fixed application service run, Datasync run, Batchjob …
aihamh Jun 14, 2024
fb054da
code cleanup
aihamh Jun 14, 2024
8bf232c
updated pom
aihamh Jul 1, 2024
669c694
Merge branch 'develop-java21' of https://github.com/mosip/pre-registr…
aihamh Jul 1, 2024
8d5f66e
updated datasync docker
aihamh Jul 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pre-registration/pre-registration-application-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${spring.boot.version}</version>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -140,7 +139,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.version}</version>
<configuration>
<compilerArgs>
<arg>-parameters</arg>
Expand Down
5 changes: 4 additions & 1 deletion pre-registration/pre-registration-captcha-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<version>${spring-cloud-config.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
Expand Down
6 changes: 6 additions & 0 deletions pre-registration/pre-registration-datasync-service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ ENV artifactory_url_env=${artifactory_url}
# environment variable to pass iam_adapter url, at docker runtime
ENV iam_adapter_url_env=${iam_adapter_url}

# environment variable to pass virusscanner url, at docker runtime
ENV virusscanner_url_env=${virusscanner_url}

# can be passed during Docker build as build time environment for github branch to pickup configuration from.
ARG container_user=mosip

Expand Down Expand Up @@ -90,6 +93,9 @@ CMD if [ "$is_glowroot_env" = "present" ]; then \
java -jar -javaagent:glowroot/glowroot.jar -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" pre-registration-datasync-service.jar ; \
else \
wget -q --show-progress "${iam_adapter_url_env}" -O "${loader_path_env}"/kernel-auth-adapter.jar; \
wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/io/mosip/kernel/kernel-ref-idobjectvalidator/kernel-ref-idobjectvalidator.jar -O "${loader_path_env}"/kernel-ref-idobjectvalidator.jar ; \
wget -q --show-progress "${artifactory_url_env}"/artifactory/libs-release-local/icu4j/kernel-transliteration-icu4j.jar -O "${loader_path_env}"/kernel-transliteration-icu4j.jar ; \
wget -q --show-progress "${virusscanner_url_env}" -O "${loader_path_env}"/kernel-virusscanner-clamav.jar; \
java -jar -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" pre-registration-datasync-service.jar ; \
fi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,4 +443,17 @@ prereg.auth.jwt.secret=Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=
prereg.auth.jwt.token.expiration=1800
prereg.auth.jwt.token.roles=INDIVIDUAL
prereg.auth.jwt.scope = PRE-REGISTRATION;
mosip.preregistration.captcha.enable=false
mosip.preregistration.captcha.enable=false

pre.reg.login.otp.validation-attempt-threshold: 10
registrationcenter.centerdetail.rest.uri=${mosip.base.url}/v1/masterdata/registrationcenters
mosip.preregistration.document.update.docrefId.id=mosip.preregistration.docrefId.update
mosip.preregistration.applications.status.get = mosip.preregistration.applications.status
mosip.preregistration.applications.details.get = mosip.preregistration.applications.detail.info
mosip.preregistration.applications.all.get = mosip.preregistration.applications.all
mosip.preregistration.uispec.latest=mosip.preregistration.uispec.latest
mosip.preregistration.uispec.all=mosip.preregistration.uispec.all
preregistration.cookie.contextpath=/preregistration/
mosip.preregistration.appointment.getavailablity.url=${mosip.base.url}/preregistration/v1/appointment/availability/{registrationCenterId}
mosip.preregistration.appointment.book.url=${mosip.base.url}/preregistration/v1/appointment/{preRegistrationId}
mosip.preregistration.appointment.multi.book.url=${mosip.base.url}/preregistration/v1/appointment
Loading