Merge of develop to master #28

helenKaryamsetty · 2023-12-14T12:41:59Z

Description

Merge of develop to master. Upstreaming master with develop

Type of change

How Has This Been Tested?

No Testing is required since, no code is changed only code merged from develop to master.

Test A
Test B

Checklist:

My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
My changes generate no new warnings
Any dependent changes have been merged and published in downstream modules

removed the target directory and added gitignore

* Create README.md * Update README.md * Update README.md * Update README.md * Update README.md

* Crypto logic added and pom clean up 1. Added the new crypto logic for database credentials 2. Cleaned up the POM file * Github action workflow changes

* Create COPYING * Create CODE_OF_CONDUCT.md * Create CONTRIBUTING.md * Update README.md

* modified .gitignore file * modified .gitignore file * Delete Maven Build and CodeQL Analysis.yml

Added copyright text

* Password encryption changes * Password encryption changes * Password encryption removal

* Update sast-and-package-prod.yml * Update sast-and-package.yml

code smell fixes

* API Cleanup * API Cleanup * API Cleanup * API Cleanup * API Cleanup

verifyBio and generateMobileOTP api creation

* Update pom.xml * Update .gitignore * Delete bin directory

api creation for confirm aadhaar bio

Added Pull Request template,modified application.properties

Add CI build properties, add pom.xml plugins to tweak build process

http changes

…into develop

Resolved merge conflicts prior master merge

ravishanigarapu

looks fine

harimohanr and others added 30 commits June 2, 2023 12:03

removed the target directory and added gitignore

1207e7a

Merge pull request #2 from PSMRI/cleanup

dc3fc65

removed the target directory and added gitignore

Added README.md file (#3)

91a8efd

* Create README.md * Update README.md * Update README.md * Update README.md * Update README.md

Crypto logic added and pom clean up (#4)

98785f2

* Crypto logic added and pom clean up 1. Added the new crypto logic for database credentials 2. Cleaned up the POM file * Github action workflow changes

Update README.md

f973d7b

updated copying, contributing, code_of_conduct and readme file (#5)

342f4b7

* Create COPYING * Create CODE_OF_CONDUCT.md * Create CONTRIBUTING.md * Update README.md

modified .gitignore file (#6)

ff3088c

Update gitignore (#7)

d486673

* modified .gitignore file * modified .gitignore file * Delete Maven Build and CodeQL Analysis.yml

Done vulnerability fix and added sonar properties in pom.xml (#8)

ef56424

Added copyright text

29865af

Merge pull request #10 from PSMRI/copy

c415173

Added copyright text

Swagger changes (#11)

e1864fa

Create sast-and-package-prod.yml (#12)

8b68245

Password encryption removal (#13)

69d92be

* Password encryption changes * Password encryption changes * Password encryption removal

Passing Environment Variable (#14)

c7b2a6c

Workflow change (#15)

9145a79

* Update sast-and-package-prod.yml * Update sast-and-package.yml

code smell fixes

8df258b

Merge pull request #16 from sachitsinha1/code_smell

bb4e3f0

code smell fixes

API Cleanup (#17)

d503e48

* API Cleanup * API Cleanup * API Cleanup * API Cleanup * API Cleanup

Update sast-and-package-prod.yml (#18)

7c93251

verifyBio and generateMobileOTP api creation

c8ec8f9

added 2 properties

cd5fe38

Merge pull request #19 from mukul5947/develop

f427825

verifyBio and generateMobileOTP api creation

Delete .github/workflows/sast-and-package-prod.yml

2b6a747

Delete .github/workflows/sast-and-package.yml

735cbeb

Create package-prod.yml

28d0ab5

Create package.yml

cf10504

Create sast.yml

fadf5a3

Failure to use HTTPS or SFTP URL in Maven artifact upload/download (#20)

151b86a

* Update pom.xml * Update .gitignore * Delete bin directory

Added Pull Request template,modified application.properties

4920678

MukulChajed and others added 21 commits October 9, 2023 17:06

api creation for confirm aadhaar bio

6d61448

Merge pull request #23 from mukul5947/develop

f7cb1b1

api creation for confirm aadhaar bio

Merge branch 'PSMRI:develop' into develop

2cc7b2c

resolved conflicts

f176a9a

Update application.properties

83c0de7

resolved conflicts

22f562f

resolved conflicts

4d84b0c

Merge pull request #21 from swetatech24/develop

78d336f

Added Pull Request template,modified application.properties

Add CI build process

b277965

Edit readme

d670551

Fix readme heading

9b57f72

Add local properties file to gitignore

07b073a

Source properties file path fix

b69ef7a

Merge pull request #25 from drtechie/develop

bb40a9c

Add CI build properties, add pom.xml plugins to tweak build process

http changes

439b90f

Delete .factorypath

1b33e48

Merge pull request #26 from bshivani7/develop

f058ec6

http changes

resolved merge conflicts prior develop to master merge

a344159

Merge branch 'develop' of https://github.com/helenKaryamsetty/FHIR-API …

97d9bef

…into develop

removed config file

cec97fb

Merge pull request #27 from helenKaryamsetty/develop

15dbbaf

Resolved merge conflicts prior master merge

helenKaryamsetty requested a review from ravishanigarapu December 14, 2023 12:42

ravishanigarapu approved these changes Dec 14, 2023

View reviewed changes

ravishanigarapu merged commit dfb35e9 into master Dec 14, 2023

pavangsk deleted the develop branch September 6, 2024 07:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge of develop to master #28

Merge of develop to master #28

helenKaryamsetty commented Dec 14, 2023

ravishanigarapu left a comment

Merge of develop to master #28

Merge of develop to master #28

Conversation

helenKaryamsetty commented Dec 14, 2023

Description

Type of change

How Has This Been Tested?

Checklist:

ravishanigarapu left a comment

Choose a reason for hiding this comment