Skip to content

PEG-3295 elastic 9 #149

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.

Sign up for GitHub

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

Merged
zozd-hmcts merged 10 commits into from
Sep 9, 2026
Merged

PEG-3295 elastic 9 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee18b9e
CCT-1923 Code Merge (#140)
erolkurelihmcts Aug 21, 2026
5525383
updating poms for 17.104.193 branch with snapshot versions
Aug 21, 2026
495aa72
updating poms for 17.104.194-SNAPSHOT development
Aug 21, 2026
c9e079d
updating poms for branch'dev/release-17.104.193' with non-snapshot ve…
Aug 21, 2026
1a66147
Merge branch 'dev/release-17.104.193' into dev/release
Aug 21, 2026
a58776e
updating develop poms to master versions to avoid merge conflicts
Aug 21, 2026
1275560
Merge branch 'dev/release' into main
Aug 21, 2026
4dbc2b0
Updating develop poms back to pre merge state
Aug 21, 2026
91446c7
Merge remote-tracking branch 'origin/main' into team/PEG-3295-elastic-9
zozd-hmcts Sep 9, 2026
c02768b
PEG-3295 Elastic upgrade to test with Java25
zozd-hmcts Sep 9, 2026
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: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<groupId>uk.gov.moj.cpp.sjp</groupId>
<artifactId>sjp-parent</artifactId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion sjp-command/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-parent</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion sjp-command/sjp-command-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-command</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-command/sjp-command-controller/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-command</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-command/sjp-command-handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-command</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-domain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<artifactId>sjp-parent</artifactId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>

<artifactId>sjp-domain</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sjp-domain/sjp-domain-aggregate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<artifactId>sjp-domain</artifactId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>

<artifactId>sjp-domain-aggregate</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sjp-domain/sjp-domain-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<artifactId>sjp-domain</artifactId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion sjp-domain/sjp-domain-event-processor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-domain</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-domain/sjp-domain-event/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<artifactId>sjp-domain</artifactId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>

<artifactId>sjp-domain-event</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sjp-domain/sjp-domain-prosecution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>sjp-domain</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>

<artifactId>sjp-domain-prosecution</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sjp-domain/sjp-domain-transformation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-domain</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-domain/sjp-domain-transformation/sjp-domain-transformation-anonymise/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-domain-transformation</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-domain/sjp-domain-transformation/sjp-domain-transformation-postcode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-domain-transformation</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-event-sources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-parent</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion sjp-event/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-parent</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion sjp-event/sjp-event-indexer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-event</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-event/sjp-event-listener/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-event</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-event/sjp-event-processor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-event</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
12 changes: 11 additions & 1 deletion ...src/yaml/json/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,17 @@
"originator": "ATCM",
"requestId": "C22dA7cB-CBEE-D7ee-6BBc-ACF2cB50cBDF",
"acknowledgement": {
"accountNumber": "123456780"
"accountNumber": "987654321",
"minorCreditors": [
{
"minorCreditorId": "b2c3d4e5-6789-01bc-def0-234567890abc",
"minorCreditorAccountNumber": "MC12345678"
},
{
"minorCreditorId": "c3d4e5f6-7890-12cd-ef01-34567890abcd",
"minorCreditorAccountNumber": "MC87654321"
}
]
},
"exportStatus": "ENFORCEMENT_REQUEST_SELECTED",
"updated": "2018-06-01T09:00:00Z"
Expand Down
28 changes: 27 additions & 1 deletion ...l/json/schema/public.stagingenforcement.enforce-financial-imposition-acknowledgement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"definitions": {
"uuid": {
"type": "string",
"pattern": "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
},
"acknowledgement": {
"type": "object",
Expand All @@ -52,6 +52,13 @@
"type": "string",
"minLength": 9,
"maxLength": 9
},
"minorCreditors": {
"description": "Minor creditors with GoB-generated account numbers (optional)",
"type": "array",
"items": {
"$ref": "#/definitions/minorCreditorAcknowledgement"
}
}
},
"additionalProperties": false,
Expand All @@ -76,6 +83,25 @@
]
}
]
},
"minorCreditorAcknowledgement": {
"type": "object",
"properties": {
"minorCreditorId": {
"description": "UUID of the minor creditor (Compensate) in Common Platform",
"type": "string",
"maxLength": 36
},
"minorCreditorAccountNumber": {
"description": "GoB-generated account number for the minor creditor",
"type": "string"
}
},
"additionalProperties": false,
"required": [
"minorCreditorId",
"minorCreditorAccountNumber"
]
}
}
}
2 changes: 1 addition & 1 deletion sjp-healthchecks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-parent</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-integration-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<artifactId>sjp-parent</artifactId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion sjp-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>sjp-parent</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-query/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-parent</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-query/sjp-query-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-query</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-query/sjp-query-view/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-query</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sjp-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<artifactId>sjp-parent</artifactId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<artifactId>sjp-service</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion sjp-viewstore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-parent</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>sjp-viewstore</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sjp-viewstore/sjp-viewstore-liquibase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<artifactId>sjp-viewstore</artifactId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>

<artifactId>sjp-viewstore-liquibase</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sjp-viewstore/sjp-viewstore-persistence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>sjp-viewstore</artifactId>
<groupId>uk.gov.moj.cpp.sjp</groupId>
<version>17.104.184-DD-41592-SNAPSHOT</version>
<version>17.104.184-PEG-3295-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading