Skip to content

Adop 2776 #1050

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

Open
NewmanJustice wants to merge 26 commits into
base: master
Choose a base branch
from
Open

Adop 2776 #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cc19503
ADOP-2759: upgrade java-logging from 6.1.9 to 8.0.0
NewmanJustice Mar 10, 2026
61631a1
Update functional test fixtures and Docmosis template reference
NewmanJustice Mar 10, 2026
50b711c
Merge branch 'master' into ADOP-2759-java-logging-upgrade
NewmanJustice Mar 10, 2026
6c005c7
Refactored json data and uncommented ApplicationPaymentFT tests
NewmanJustice Mar 12, 2026
e22ce8e
Improve contract test readiness and pact publishing
NewmanJustice Mar 17, 2026
d536c0d
Amended docker image due to pipeline failure
NewmanJustice Mar 17, 2026
c2de94d
Remove architecture and copilot instruction files from tracking
NewmanJustice Mar 17, 2026
f19c05a
Reverted generate-ccd-definition.sh back to hmctspublic.azurecr.io.
NewmanJustice Mar 17, 2026
90352e8
Bumping chart version/ fixing aliases
hmcts-jenkins-a-to-c[bot] Mar 17, 2026
5663ced
Added tomcat-embed-core and tomcat-embed-websocket to suppressions
NewmanJustice Mar 17, 2026
4f39932
Merge branch 'ADOP-2776' of https://github.com/hmcts/adoption-cos-api…
NewmanJustice Mar 17, 2026
2482a2d
PACT_BROKER_FULL_URL fixes
NewmanJustice Mar 17, 2026
c3c79b3
Merge branch 'master' into ADOP-2776
NewmanJustice Mar 17, 2026
745aefe
adding logging on build.gradle to capture more detail on PACT build.g…
NewmanJustice Mar 17, 2026
18528b2
added logging
NewmanJustice Mar 17, 2026
c4687c5
change to pactbroker url
NewmanJustice Mar 17, 2026
fafac66
Reverted changes to helm referencess
NewmanJustice Mar 20, 2026
12365b5
Fix Pact broker URL assignment in pact DSL closures
NewmanJustice Mar 20, 2026
3fc5281
Trigger pipeline re-run
NewmanJustice Mar 20, 2026
2332d67
Fix pact publish version property
NewmanJustice Mar 24, 2026
9c29fd2
fix: resolve Java 21 AKS deploy failures in preview environment
NewmanJustice Mar 25, 2026
311fac0
fix: move pipelineJavaVersion declaration after plugins block
NewmanJustice Mar 25, 2026
4a7ee03
fix: update Helm dependency repositories to new ACR registry
NewmanJustice Mar 25, 2026
18f6422
change to hmctsprod on charts and docker
NewmanJustice Mar 27, 2026
6b593b2
renamed smoke test in build.gradel
NewmanJustice Mar 27, 2026
eb2744c
reverted change to the smoke test
NewmanJustice Mar 31, 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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,8 @@ bin/main/application.yaml

### Generated CCD Json Definition ###
ccd-definitions/definitions/development

### Miscellaneous ###
ARCHITECTURE.md
copilot-instructions.md
.github/copilot-instructions.md
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG APP_INSIGHTS_AGENT_VERSION=3.5.2

# Application image

FROM hmctspublic.azurecr.io/base/java:21-distroless
FROM hmctsprod.azurecr.io/base/java:21-distroless

COPY lib/applicationinsights.json /opt/app/
COPY build/libs/adoption-cos-api.jar /opt/app/
Expand Down
3 changes: 2 additions & 1 deletion bin/functionalTest/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ uk:
LOCAL_COURT_APPLICATION_SUBMITTED: '2960d8dd-ab3e-4265-a71d-2d81d0fd84c8'
CITIZEN_DRAFT_APPLICATION_EXPIRING_ALERT: ''


s2s-authorised:
services: ${S2S_AUTHORISED_SERVICES:ccd_data}

Expand Down Expand Up @@ -77,7 +78,7 @@ case_document_am:
docmosis:
templates:
english:
ADOPTION_APPLICATION_SUMMARY: FL-ADO-APP-ENG-00953.docx
ADOPTION_APPLICATION_SUMMARY: FL-ADO-APP-ENG-00953-R2.docx
welsh:
ADOPTION_APPLICATION_SUMMARY: FL-ADO-APP-WEL-00955.docx

Expand Down
14 changes: 9 additions & 5 deletions bin/functionalTest/casedata/ccd-callback-casedata-application-payment-added.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
"value": {
"siblingId": "1646222663145",
"siblingRelation": "Brother",
"siblingPoType": "some order",
"siblingPoNumber": "1001"
"siblingPoType": "Adoption order",
"siblingPoNumber": "1001",
"siblingPlacementOtherType": ""
}
},
{
"id": "1646222699254",
"value": {
"siblingId": "1646222699254",
"siblingRelation": "Sister",
"siblingPoType": "some other order",
"siblingPoNumber": "23456"
"siblingPoType": "Other",
"siblingPoNumber": "23456",
"siblingPlacementOtherType": "other type"
}
}
],
Expand Down Expand Up @@ -134,7 +136,7 @@
"value": {
"placementOrderId": "1646222494045",
"placementOrderDate": "2021-12-12",
"placementOrderType": "some order2",
"placementOrderType": "Adoption order",
"placementOrderCourt": "london court",
"placementOrderNumber": "12345"
}
Expand Down Expand Up @@ -212,6 +214,8 @@
],
"solicitorName": null,
"selectedSiblingId": "1646222699254",
"selectedSiblingRelation": "Sister",
"selectedSiblingPoType": "Adoption order",
"solicitorPhoneNumber": null,
"birthFatherAddressCountry": null,
"applicant2AddressTown": "NOTTINGHAM",
Expand Down
14 changes: 9 additions & 5 deletions bin/functionalTest/casedata/ccd-callback-casedata-application-payment-failed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
"value": {
"siblingId": "1646222663145",
"siblingRelation": "Brother",
"siblingPoType": "some order",
"siblingPoNumber": "1001"
"siblingPoType": "Adoption order",
"siblingPoNumber": "1001",
"siblingPlacementOtherType": ""
}
},
{
"id": "1646222699254",
"value": {
"siblingId": "1646222699254",
"siblingRelation": "Sister",
"siblingPoType": "some other order",
"siblingPoNumber": "23456"
"siblingPoType": "Other",
"siblingPoNumber": "23456",
"siblingPlacementOtherType": "other type"
}
}
],
Expand Down Expand Up @@ -134,7 +136,7 @@
"value": {
"placementOrderId": "1646222494045",
"placementOrderDate": "2021-12-12",
"placementOrderType": "some order2",
"placementOrderType": "Adoption order",
"placementOrderCourt": "london court",
"placementOrderNumber": "12345"
}
Expand Down Expand Up @@ -212,6 +214,8 @@
],
"solicitorName": null,
"selectedSiblingId": "1646222699254",
"selectedSiblingRelation": "Sister",
"selectedSiblingPoType": "Adoption order",
"solicitorPhoneNumber": null,
"birthFatherAddressCountry": null,
"applicant2AddressTown": "NOTTINGHAM",
Expand Down
14 changes: 9 additions & 5 deletions bin/functionalTest/casedata/ccd-callback-casedata-application-payment-not-ready.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
"value": {
"siblingId": "1646222663145",
"siblingRelation": "Brother",
"siblingPoType": "some order",
"siblingPoNumber": "1001"
"siblingPoType": "Adoption order",
"siblingPoNumber": "1001",
"siblingPlacementOtherType": ""
}
},
{
"id": "1646222699254",
"value": {
"siblingId": "1646222699254",
"siblingRelation": "Sister",
"siblingPoType": "some other order",
"siblingPoNumber": "23456"
"siblingPoType": "Other",
"siblingPoNumber": "23456",
"siblingPlacementOtherType": "other type"
}
}
],
Expand Down Expand Up @@ -134,7 +136,7 @@
"value": {
"placementOrderId": "1646222494045",
"placementOrderDate": "2021-12-12",
"placementOrderType": "some order2",
"placementOrderType": "Adoption order",
"placementOrderCourt": "london court",
"placementOrderNumber": "12345"
}
Expand Down Expand Up @@ -212,6 +214,8 @@
],
"solicitorName": null,
"selectedSiblingId": "1646222699254",
"selectedSiblingRelation": "Sister",
"selectedSiblingPoType": "Adoption order",
"solicitorPhoneNumber": null,
"birthFatherAddressCountry": null,
"applicant2AddressTown": "NOTTINGHAM",
Expand Down
19 changes: 14 additions & 5 deletions bin/functionalTest/casedata/ccd-callback-casedata-application-payment-ready.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
"value": {
"siblingId": "1646222663145",
"siblingRelation": "Brother",
"siblingPoType": "some order",
"siblingPoNumber": "1001"
"siblingPoType": "Adoption order",
"siblingPoNumber": "1001",
"siblingPlacementOtherType": ""
}
},
{
"id": "1646222699254",
"value": {
"siblingId": "1646222699254",
"siblingRelation": "Sister",
"siblingPoType": "some other order",
"siblingPoNumber": "23456"
"siblingPoType": "Other",
"siblingPoNumber": "23456",
"siblingPlacementOtherType": "other type"
}
}
],
Expand Down Expand Up @@ -135,7 +137,7 @@
"value": {
"placementOrderId": "1646222494045",
"placementOrderDate": "2021-12-12",
"placementOrderType": "some order2",
"placementOrderType": "Adoption order",
"placementOrderCourt": "london court",
"placementOrderNumber": "12345"
}
Expand Down Expand Up @@ -213,6 +215,8 @@
],
"solicitorName": null,
"selectedSiblingId": "1646222699254",
"selectedSiblingRelation": "Sister",
"selectedSiblingPoType": "Adoption order",
"solicitorPhoneNumber": null,
"birthFatherAddressCountry": null,
"applicant2AddressTown": "NOTTINGHAM",
Expand Down Expand Up @@ -242,6 +246,11 @@
"Irish",
"Other"
],
"childLocalAuthority": "la",
"childLocalAuthorityEmail": "abc@gov.uk",
"childSocialWorkerEmail": "abc@gov.uk",
"childSocialWorkerName": "null",
"childSocialWorkerPhoneNumber": "1234567890",
"applicant2Email": null,
"otherParentAddressCounty": "CITY OF WESTMINSTER",
"applicant2LanguagePreference": null,
Expand Down
14 changes: 9 additions & 5 deletions bin/functionalTest/casedata/ccd-callback-casedata-application-validation-failed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
"value": {
"siblingId": "1646222663145",
"siblingRelation": "Brother",
"siblingPoType": "some order",
"siblingPoNumber": "1001"
"siblingPoType": "Adoption order",
"siblingPoNumber": "1001",
"siblingPlacementOtherType": ""
}
},
{
"id": "1646222699254",
"value": {
"siblingId": "1646222699254",
"siblingRelation": "Sister",
"siblingPoType": "some other order",
"siblingPoNumber": "23456"
"siblingPoType": "Other",
"siblingPoNumber": "23456",
"siblingPlacementOtherType": "other type"
}
}
],
Expand Down Expand Up @@ -134,7 +136,7 @@
"value": {
"placementOrderId": "1646222494045",
"placementOrderDate": "2021-12-12",
"placementOrderType": "some order2",
"placementOrderType": "Adoption order",
"placementOrderCourt": "london court",
"placementOrderNumber": "12345"
}
Expand Down Expand Up @@ -212,6 +214,8 @@
],
"solicitorName": null,
"selectedSiblingId": "1646222699254",
"selectedSiblingRelation": "Sister",
"selectedSiblingPoType": "Adoption order",
"solicitorPhoneNumber": null,
"birthFatherAddressCountry": null,
"applicant2AddressTown": "NOTTINGHAM",
Expand Down
15 changes: 10 additions & 5 deletions bin/functionalTest/casedata/ccd-callback-casedata-application.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
"value": {
"siblingId": "1646222663145",
"siblingRelation": "Brother",
"siblingPoType": "some order",
"siblingPoNumber": "1001"
"siblingPoType": "Adoption order",
"siblingPoNumber": "1001",
"siblingPlacementOtherType": ""
}
},
{
"id": "1646222699254",
"value": {
"siblingId": "1646222699254",
"siblingRelation": "Sister",
"siblingPoType": "some other order",
"siblingPoNumber": "23456"
"siblingPoType": "Other",
"siblingPoNumber": "23456",
"siblingPlacementOtherType": "other type"
}
}
],
Expand Down Expand Up @@ -134,7 +136,7 @@
"value": {
"placementOrderId": "1646222494045",
"placementOrderDate": "2021-12-12",
"placementOrderType": "some order2",
"placementOrderType": "Adoption order",
"placementOrderCourt": "london court",
"placementOrderNumber": "12345"
}
Expand Down Expand Up @@ -212,6 +214,8 @@
],
"solicitorName": null,
"selectedSiblingId": "1646222699254",
"selectedSiblingRelation": "Sister",
"selectedSiblingPoType": "Adoption order",
"solicitorPhoneNumber": null,
"birthFatherAddressCountry": null,
"applicant2AddressTown": "NOTTINGHAM",
Expand Down Expand Up @@ -247,4 +251,5 @@
"applicant2LanguagePreference": null,
"birthMotherOccupation": "Teacher",
"applicant1AddressSameAsApplicant1": null

}
Loading