Skip to content

DTSPB-4689 Changed commons version #1378

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
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

DTSPB-4689 Changed commons version #1378

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
07a6c82
DTSPB-4689 Changed commons version
IswaryaPepakayala Sep 9, 2025
ec14d10
Bumping chart version/ fixing aliases
hmcts-jenkins-j-to-z[bot] Sep 9, 2025
7e6360f
DTSPB-4689 Changed the Intestacy mapper
IswaryaPepakayala Sep 9, 2025
e68c14f
DTSPB-4689 changed commons version
IswaryaPepakayala Sep 19, 2025
948ede3
use updated mappings.
tom-saunders-cts Sep 17, 2025
47abf1b
DTSPB-4697 update mapping for new rel-to-decd (#1385)
tom-saunders-cts Oct 2, 2025
6c171b6
DTSPB-4689 Merge master
IswaryaPepakayala Oct 17, 2025
62f9aed
Dtspb 4704 intestacy child journey changes (#1397)
IswaryaPepakayala Oct 17, 2025
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 build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def versions = [
mapStruct : '1.3.0.Final',
pact_version : '4.1.34',
piTest : '1.20.2',
probateCommonsVersion : '2.2.12',
probateCommonsVersion : '2.2.12-DTSPB-4689-v2',
restAssured : '5.5.6',
serenity : '4.2.34',
serviceAuthProviderClient : '5.3.3',
Expand Down
2 changes: 1 addition & 1 deletion charts/probate-orchestrator-service/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: probate-orchestrator-service
home: https://github.com/hmcts/probate-orchestrator-service
version: 1.0.51
version: 1.0.52
description: HMCTS Probate Orchestrator Service
maintainers:
- name: HMCTS Probate Team
Expand Down
6 changes: 3 additions & 3 deletions charts/probate-orchestrator-service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ java:
DEPLOYMENT_ENV: "{{ .Values.global.environment }}"
SERVICES_PERSISTENCE_BASEURL: "http://probate-persistence-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
SERVICES_CORECASEDATA_BASEURL: "http://ccd-data-store-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
SERVICES_CORECASEDATA_BASEURL: "http://probate-back-office-pr-3376-ccd-data-store-api"
SERVICES_AUTH_PROVIDER_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
AUTH_IDAM_CLIENT_BASEURL: "https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net"
SUBMIT_SERVICE_API_URL: "http://probate-submit-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
SUBMIT_SERVICE_API_URL: "http://probate-submit-service-pr-1215-java"
BUSINESS_SERVICE_API_URL: "http://probate-business-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
BACK_OFFICE_API_URL: "http://probate-back-office-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
BACK_OFFICE_API_URL: "http://probate-back-office-pr-3376-java"
MAIL_JAVAMAILPROPERTIES_MAIL_SMTP_SSL_ENABLE: false
MAIL_JAVAMAILPROPERTIES_MAIL_SMTP_AUTH: false
SERVICES_CORECASEDATA_ENABLED: true
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ public interface IntestacyMapper extends FormMapper<GrantOfRepresentationData, I
@Mapping(target = "deceasedMaritalStatus", expression = "java(form.getDeceased()!= null ? "
+ "MaritalStatus.fromString(form.getDeceased().getMaritalStatus()) : null)")
@Mapping(target = "deceasedDivorcedInEnglandOrWales", source = "deceased.divorcedInEnglandOrWales")
@Mapping(target = "deceasedDivorcedDateKnown", source = "deceased.divorcedDateKnown")
@Mapping(target = "dateOfDivorcedCPJudicially", source = "deceased.divorcedDate")
@Mapping(target = "deceasedOtherChildren", source = "deceased.otherChildren")
@Mapping(target = "declarationCheckbox", source = "declaration.declarationCheckbox")
@Mapping(target = "legalStatement", source = "declaration.legalStatement")
Expand Down