Skip to content

PEG-2848: Merge dev/PEG-2848-R14-merge2 into team/PEG-2848-R14#165

Open
vmuthuhm wants to merge 7 commits into
team/PEG-2848-R14from
dev/PEG-2848-R14-merge2
Open

PEG-2848: Merge dev/PEG-2848-R14-merge2 into team/PEG-2848-R14#165
vmuthuhm wants to merge 7 commits into
team/PEG-2848-R14from
dev/PEG-2848-R14-merge2

Conversation

@vmuthuhm

@vmuthuhm vmuthuhm commented Jun 1, 2026

Copy link
Copy Markdown

Summary

  • Rebase of dev/PEG-2848-R14-merge2 onto release/26.14
  • Merge rebased changes from dev/PEG-2848-R14-merge2 into team/PEG-2848-R14
  • Resolved pom.xml version conflicts by keeping release/26.14 versions

Test plan

  • Verify CI pipeline passes
  • Confirm pom.xml versions align with release/26.14 baseline

🤖 Generated with Claude Code

devops-team and others added 7 commits June 1, 2026 19:53
)

* CCT-2357 code merge (#30)

* updating poms for 17.0.144-SNAPSHOT development

* Dev/merge teamcimd50 into main (#31)

* Initial commit of migrated source code (#3)

* Initial commit of migrated source code

* Add global allowlist to gitleaks custom rules

Added global allowlist with specified paths and regexes.

* New 17.0.88-cimd1560-SNAPSHOT

* New 17.0.89-cimd1560-SNAPSHOT

* updated pom

---------

Co-authored-by: jayenhc <jayenhc@yahoo.com>
Co-authored-by: devops-team <devops-team@hmcts.net>

* updating poms for 17.0.144 branch with snapshot versions

* updating poms for 17.0.145-SNAPSHOT development

* updating poms for branch'dev/release-17.0.144' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* DD-41695: added payload validation checks on outstanding fines event (#37)

* Added DD-41695 team branch

* DD-41695: added payload validation checks on outstanding fines event (#35)

* New 17.0.146-dd-41695-SNAPSHOT

* DD-41695: updated hearing.query.outstanding-fines event (#36)

* New 17.0.147-dd-41695-SNAPSHOT

* DD41695: merge to master

---------

Co-authored-by: devops-team <devops-team@hmcts.net>

* updating poms for 17.0.145 branch with snapshot versions

* updating poms for 17.0.146-SNAPSHOT development

* updating poms for branch'dev/release-17.0.145' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* Revert "CCT-2357 code merge (#30)" (#41)

* Revert "CCT-2357 code merge (#30)"

This reverts commit bac14b0

* fix build

* update ref data

* updating poms for 17.0.146 branch with snapshot versions

* updating poms for 17.0.147-SNAPSHOT development

* updating poms for branch'dev/release-17.0.146' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* CCT-2357 code merge

* updating poms for 17.0.147 branch with snapshot versions

* updating poms for 17.0.148-SNAPSHOT development

* updating poms for branch'dev/release-17.0.147' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* CAD-492 civil tranche 1 toggle off

* CAD-492 update core domain civil tranche 1 toggle off

* merge team/CCT-2371 into main (#83)

* merge team/CCT-2371 into main

* update pom

* updating poms for 17.0.148 branch with snapshot versions

* updating poms for 17.0.149-SNAPSHOT development

* updating poms for branch'dev/release-17.0.148' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* merge team/CCT-2257 into main (#82)

Co-authored-by: jayenhc <jayenhc@yahoo.com>

* updating poms for 17.0.149 branch with snapshot versions

* updating poms for 17.0.150-SNAPSHOT development

* updating poms for branch'dev/release-17.0.149' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* updating poms for 17.0.150 branch with snapshot versions

* updating poms for 17.0.151-SNAPSHOT development

* updating poms for branch'dev/release-17.0.150' with non-snapshot versions

* updating develop poms to master versions to avoid merge conflicts

* Updating develop poms back to pre merge state

* RELEASE-ENGG-2609: Bump pom version to -RE-SNAPSHOT

* PEG-2973 cpp-context-hearing version upgraded

* PEG-2973 cpp-context-hearing Framework D changes

* PEG-2848: fix build issue

* dummy commit to create image (#64)

* dummy commit to create image

* dummy commit to create image

---------

Co-authored-by: vmuthu <velmurrugan.muthu2@hmcts.net>

* Rebase from RELEASE-ENGG-2609, Update version to 17.0.146-RBSD-2609-SNAPSHOT

---------

Co-authored-by: yilmazsaritemur2 <150049030+yilmazsaritemur2@users.noreply.github.com>
Co-authored-by: embedded_devops_sa <devops-team@hmcts.net>
Co-authored-by: Sivarama Varma Penmetsa <30878701+psrvarma@users.noreply.github.com>
Co-authored-by: jayenhc <jayenhc@yahoo.com>
Co-authored-by: rsukka <146491415+rsukka@users.noreply.github.com>
Co-authored-by: narayansingh <narayan.singh@hmcts.net>
Co-authored-by: rajkumar.meena <rajkumar.meena@hmcts.net>
Co-authored-by: aykutdanisman <aykutdanisman@gmail.com>
Co-authored-by: Raj Kumar Meena <rajkumarmeena.iitm@gmail.com>
Co-authored-by: Zeeshan Alam <zeeshan.alam@hmcts.net>
Co-authored-by: vmuthu <velmurrugan.muthu2@hmcts.net>
Co-authored-by: MohamedFarouk-HMCTS <mohamed.farouk@hmcts.net>
@vmuthuhm vmuthuhm requested a review from a team as a code owner June 1, 2026 19:19
@vmuthuhm vmuthuhm requested review from JakeM-Kainos, Mobolaji-Justice and ramakrishna-mak and removed request for a team June 1, 2026 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants