Skip to content

PEG-2848-R14: merge from team/PEG-2848-R#317

Merged
zeeshanalamhmcts merged 46 commits into
team/PEG-2848-R14from
dev/PEG-2848-R14-merge-from-R
May 22, 2026
Merged

PEG-2848-R14: merge from team/PEG-2848-R#317
zeeshanalamhmcts merged 46 commits into
team/PEG-2848-R14from
dev/PEG-2848-R14-merge-from-R

Conversation

@zeeshanalamhmcts
Copy link
Copy Markdown

Summary

  • Merges origin/team/PEG-2848-R into team/PEG-2848-R14
  • Java conflicts auto-resolved: kept R14 version, then applied javax.json.Jsonuk.gov.justice.services.messaging.JsonObjects transformation where needed
  • pom.xml conflicts resolved manually
  • No files contained .readEntity(String.class);

Test plan

  • CI passes (build + tests + Sonar)
  • Spot-check transformed Java files for correct JsonObjects usage

zozd-hmcts and others added 30 commits December 29, 2025 12:29
* PEG-2848 Testing Framework-D improvement

* PEG-2848 Testing Framework-D improvement

* Update pom.xml
PEG-2848 Testing Framework-D improvement
PEG-2848 Testing Framework-D improvement
dummy commit  to get new image in pom.xml
* PEG-2848 Testing Framework-D improvement

* PEG-2848 Testing Framework-D improvement

* Update pom.xml
vmuthu and others added 14 commits April 17, 2026 10:44
…Framework D changes

- Restore processReplay, sendPostalNotification(5-arg), courtDocumentMetadata, startDate in getFutureHearings
  to release-engg-2609 versions of DefendantsAddedToCourtProceedingsProcessor, PostalService,
  NotificationService, ListingService (PEG-2848 had removed these; they must be kept from base)
- Apply Framework D (JsonObjects.createObjectBuilder) on restored sources
- Fix ListingStub: update setupListingAnyAllocationQuery/setupListingAnyFutureAllocationQuery to 3/4-arg
  signatures matching release-engg-2609
- Fix HearingNotificationHelperTest: restore full release-engg-2609 version + Framework D changes
- Fix InitiateCourtApplicationProceedingsCommandApiTest: add linkType STANDALONE to buildEnvelope

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Rebase from release-engg-2609 & version bump to -RBSD-2609-SNAPSHOT
PEG-2848: azure-pipelines ref to dev/enforcer-disabled
Align <properties> version entries with team/release-engg-2609 so this repo's dependency resolution matches the passing release-engg-2609 configuration.

Changes:
-        <referencedata.version>17.103.131</referencedata.version>
+        <referencedata.version>17.103.129</referencedata.version>

Co-authored-by: Zeeshan Alam <zeeshan.alam@hmcts.net>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…848-R14

# Conflicts:
#	pom.xml
#	progression-command/pom.xml
#	progression-command/progression-command-api/pom.xml
#	progression-command/progression-command-handler/pom.xml
#	progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCasesToHearingBdfHandlerTest.java
#	progression-domain/pom.xml
#	progression-domain/progression-datatypes-common/pom.xml
#	progression-domain/progression-domain-aggregate/pom.xml
#	progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregateTest.java
#	progression-domain/progression-domain-common/pom.xml
#	progression-domain/progression-domain-message/pom.xml
#	progression-event-sources/pom.xml
#	progression-event/pom.xml
#	progression-event/progression-event-indexer/pom.xml
#	progression-event/progression-event-listener/pom.xml
#	progression-event/progression-event-processor/pom.xml
#	progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantsAddedToCourtProceedingsProcessor.java
#	progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterEventProcessorTest.java
#	progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ProgressionServiceTest.java
#	progression-eventprocessorstore/pom.xml
#	progression-eventprocessorstore/progression-eventprocessorstore-liquibase/pom.xml
#	progression-eventprocessorstore/progression-eventprocessorstore-persistence/pom.xml
#	progression-healthchecks/pom.xml
#	progression-integration-test/pom.xml
#	progression-performance-test/pom.xml
#	progression-query/pom.xml
#	progression-query/progression-query-api/pom.xml
#	progression-query/progression-query-view/pom.xml
#	progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ProsecutionCaseQuery.java
#	progression-refdata-service/pom.xml
#	progression-service/pom.xml
#	progression-test-utilities/pom.xml
#	progression-viewstore/pom.xml
#	progression-viewstore/progression-viewstore-liquibase/pom.xml
#	progression-viewstore/progression-viewstore-persistence/pom.xml
@zeeshanalamhmcts zeeshanalamhmcts requested a review from a team as a code owner May 21, 2026 09:30
@zeeshanalamhmcts zeeshanalamhmcts requested review from EmmaG500, gregs-cgi and nagashankarhmcts and removed request for a team May 21, 2026 09:30
@cpp-github-management
Copy link
Copy Markdown

Passed

@cpp-github-management
Copy link
Copy Markdown

Passed

@zeeshanalamhmcts zeeshanalamhmcts merged commit 2f67b2d into team/PEG-2848-R14 May 22, 2026
3 checks passed
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.

3 participants