[6 Dev] Update DSL version to 9.7.0 (finos#2783)

* Update DSL version to 9.7.0

# Conflicts:
#	RELEASE.md
#	rosetta-source/src/main/resources/cdm-sample-files/fpml-5-10/incomplete-products/commodity-derivatives/expectations.json

* Update release note

* Update expectations

* Update release note

RELEASE.md

@@ -1,15 +1,14 @@
-# Eligible Collateral Representation - CreditNotationMismatchResolutionEnum update
+# _Infrastructure - Dependency Update_
 
-_Background_
+_What is being released?_
 
-The existing enum CreditNotationMismatchResolutionEnum contains enumeration values for specifying credit notation in the case where several are listed. The values include "highest", "lowest" and other levels of credit notation as well as sourced from a defined rating agency. There is currently no option for a credit notation where bespoke language represents the label characteristics of the rating.
+This release updates the `rosetta-dsl` dependencies.
 
-_What is being released?_
+Version updates include:
+- `rosetta-dsl` 9.7.0: DSL validation and performance enhancements. For further details see DSL release notes: https://github.com/REGnosys/rosetta-dsl/releases/tag/9.7.0.
 
-* Added enum value: `Other` to cover for the case where credit notation is based on bespoke language.
+There are no changes to the model.  The number of expected ingestion validation failures has changed due to changes in the way validation failures are counted.
 
 _Review directions_
 
-* In the Rosetta platform, select the Textual Browser and inspect the change identified above.
-
-The changes can be reviewed in PR: https://github.com/finos/common-domain-model/pull/2748
+The changes can be reviewed in PR: [#2783](https://github.com/finos/common-domain-model/pull/2783)

examples/src/main/java/com/regnosys/cdm/example/Validation.java

@@ -13,9 +13,6 @@
 import java.math.BigDecimal;
 import java.util.Comparator;
 
-import static com.google.common.collect.Iterables.concat;
-import static com.google.common.collect.Lists.newArrayList;
-
 /**
  * Illustration of how to invoke validations on a CDM object as well as
  * individual validations
@@ -46,7 +43,7 @@ public void example() {
 
 		// the meta class offers granularity over which types of Validators to extract
 		//
-		var validators = newArrayList(concat(fixedRatePayoutMeta.choiceRuleValidators(), fixedRatePayoutMeta.dataRules(validatorFactory)));
+		var validators = fixedRatePayoutMeta.dataRules(validatorFactory);
 
 		// fixedRatePayoutMeta.validator() returns the cardinality validator for fixedRatePayout
 		//

pom.xml

@@ -82,9 +82,9 @@
 
         <repoServerHost>oss.sonatype.org</repoServerHost>
 
-        <rosetta.bundle.version>10.13.5</rosetta.bundle.version>
+        <rosetta.bundle.version>10.15.0</rosetta.bundle.version>
         <rosetta.code-gen.version>${rosetta.bundle.version}</rosetta.code-gen.version>
-        <rosetta.dsl.version>9.6.1</rosetta.dsl.version>
+        <rosetta.dsl.version>9.7.0</rosetta.dsl.version>
 
         <xtext.version>2.27.0</xtext.version>
         <opengamma.strata.version>1.7.0</opengamma.strata.version>
@@ -362,6 +362,16 @@
                 <artifactId>rosetta-testing</artifactId>
                 <version>${rosetta.bundle.version}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.regnosys.rosetta</groupId>
+                        <artifactId>com.regnosys.rosetta.xcore</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.service.prefs</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <!-- rosetta END -->
             <!-- xtext START -->

rosetta-project/pom.xml

@@ -23,6 +23,16 @@
                 <artifactId>ingest-test-framework</artifactId>
                 <version>${rosetta.bundle.version}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.regnosys.rosetta</groupId>
+                        <artifactId>com.regnosys.rosetta.xcore</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.service.prefs</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>

rosetta-source/src/main/resources/cdm-sample-files/dtcc-11-0/expectations.json

@@ -1,7 +1,7 @@
 [
-{"fileName":"cdm-sample-files/dtcc-11-0/DDL_NewTrade1.xml","excludedPaths":0,"externalPaths":97,"outstandingMappings":5,"validationFailures":8,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_SingleName","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}},
+{"fileName":"cdm-sample-files/dtcc-11-0/DDL_NewTrade1.xml","excludedPaths":0,"externalPaths":97,"outstandingMappings":5,"validationFailures":9,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_SingleName","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}},
 {"fileName":"cdm-sample-files/dtcc-11-0/DDL_NewTrade2.xml","excludedPaths":0,"externalPaths":89,"outstandingMappings":7,"validationFailures":9,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_Index","qualifiedObjectClass":"cdm.product.template.EconomicTerms"},{"qualifiedName":"CreditDefaultSwaption","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":2}},
 {"fileName":"cdm-sample-files/dtcc-11-0/DDL_NewTrade3.xml","excludedPaths":0,"externalPaths":76,"outstandingMappings":5,"validationFailures":6,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_Index","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}},
 {"fileName":"cdm-sample-files/dtcc-11-0/DDL_NewTrade4.xml","excludedPaths":0,"externalPaths":88,"outstandingMappings":5,"validationFailures":9,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_SingleName","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}},
 {"fileName":"cdm-sample-files/dtcc-11-0/DDL_NewTrade5.xml","excludedPaths":0,"externalPaths":74,"outstandingMappings":5,"validationFailures":10,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_SingleName","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}},
-{"fileName":"cdm-sample-files/dtcc-11-0/DDL_NewTrade6.xml","excludedPaths":0,"externalPaths":98,"outstandingMappings":6,"validationFailures":10,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_SingleName","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}}]
+{"fileName":"cdm-sample-files/dtcc-11-0/DDL_NewTrade6.xml","excludedPaths":0,"externalPaths":98,"outstandingMappings":6,"validationFailures":11,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_SingleName","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}}]

rosetta-source/src/main/resources/cdm-sample-files/dtcc-9-0/expectations.json

@@ -1,2 +1,2 @@
 [
-{"fileName":"cdm-sample-files/dtcc-9-0/SamplePayment.xml","excludedPaths":0,"externalPaths":60,"outstandingMappings":36,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}}]
+{"fileName":"cdm-sample-files/dtcc-9-0/SamplePayment.xml","excludedPaths":0,"externalPaths":60,"outstandingMappings":36,"validationFailures":6,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}}]

rosetta-source/src/main/resources/cdm-sample-files/fpml-5-10/incomplete-processes/expectations.json

@@ -1,19 +1,19 @@
 [
 {"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex19-cds-execution-allocations.xml","excludedPaths":0,"externalPaths":137,"outstandingMappings":24,"validationFailures":11,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_SingleName","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex54-execution-advice-trade-partial-termination-C11-00.xml","excludedPaths":0,"externalPaths":55,"outstandingMappings":22,"validationFailures":3,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex55-execution-advice-trade-partial-termination-cancellation-C11-10.xml","excludedPaths":0,"externalPaths":45,"outstandingMappings":13,"validationFailures":3,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex56-execution-advice-trade-full-termination-C12-00.xml","excludedPaths":0,"externalPaths":55,"outstandingMappings":22,"validationFailures":3,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex57-execution-advice-trade-full-termination_correction-C12-20.xml","excludedPaths":0,"externalPaths":55,"outstandingMappings":22,"validationFailures":3,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex54-execution-advice-trade-partial-termination-C11-00.xml","excludedPaths":0,"externalPaths":55,"outstandingMappings":22,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex55-execution-advice-trade-partial-termination-cancellation-C11-10.xml","excludedPaths":0,"externalPaths":45,"outstandingMappings":13,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex56-execution-advice-trade-full-termination-C12-00.xml","excludedPaths":0,"externalPaths":55,"outstandingMappings":22,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex57-execution-advice-trade-full-termination_correction-C12-20.xml","excludedPaths":0,"externalPaths":55,"outstandingMappings":22,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
 {"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex59-execution-advice-trade-amendment-F02-00.xml","excludedPaths":0,"externalPaths":78,"outstandingMappings":19,"validationFailures":6,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_Index","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}},
 {"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex60-execution-advice-trade-amendment-correction-F02-10.xml","excludedPaths":0,"externalPaths":78,"outstandingMappings":19,"validationFailures":6,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"CreditDefaultSwap_Index","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex61-execution-advice-trade-change-F03-00.xml","excludedPaths":0,"externalPaths":80,"outstandingMappings":57,"validationFailures":3,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex62-execution-advice-trade-change-correction-F03-10.xml","excludedPaths":0,"externalPaths":80,"outstandingMappings":57,"validationFailures":3,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex61-execution-advice-trade-change-F03-00.xml","excludedPaths":0,"externalPaths":80,"outstandingMappings":57,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex62-execution-advice-trade-change-correction-F03-10.xml","excludedPaths":0,"externalPaths":80,"outstandingMappings":57,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
 {"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex64-execution-advice-trade-initiation-correction.xml","excludedPaths":0,"externalPaths":104,"outstandingMappings":7,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"InterestRate_IRSwap_FixedFloat","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex65-execution-advice-trade-partial-termination.xml","excludedPaths":0,"externalPaths":67,"outstandingMappings":33,"validationFailures":4,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex66-execution-advice-trade-full-termination.xml","excludedPaths":0,"externalPaths":67,"outstandingMappings":33,"validationFailures":4,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex67-execution-advice-trade-full-termination-correction.xml","excludedPaths":0,"externalPaths":67,"outstandingMappings":33,"validationFailures":4,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/pkg-ex01-pkge-execution-notification.xml","excludedPaths":0,"externalPaths":172,"outstandingMappings":155,"validationFailures":3,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex65-execution-advice-trade-partial-termination.xml","excludedPaths":0,"externalPaths":67,"outstandingMappings":33,"validationFailures":6,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex66-execution-advice-trade-full-termination.xml","excludedPaths":0,"externalPaths":67,"outstandingMappings":33,"validationFailures":6,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/msg-ex67-execution-advice-trade-full-termination-correction.xml","excludedPaths":0,"externalPaths":67,"outstandingMappings":33,"validationFailures":6,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/pkg-ex01-pkge-execution-notification.xml","excludedPaths":0,"externalPaths":172,"outstandingMappings":155,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
 {"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/pkg-ex02-swap-spread-single-trade-execution-notification.xml","excludedPaths":0,"externalPaths":103,"outstandingMappings":16,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"InterestRate_IRSwap_FixedFloat","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/pkg-ex55-execution-notification.xml","excludedPaths":0,"externalPaths":190,"outstandingMappings":152,"validationFailures":3,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
-{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/pkg-ex60-request-clearing.xml","excludedPaths":0,"externalPaths":182,"outstandingMappings":153,"validationFailures":3,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/pkg-ex55-execution-notification.xml","excludedPaths":0,"externalPaths":190,"outstandingMappings":152,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
+{"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/pkg-ex60-request-clearing.xml","excludedPaths":0,"externalPaths":182,"outstandingMappings":153,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[],"qualifiableObjectCount":0}},
 {"fileName":"cdm-sample-files/fpml-5-10/incomplete-processes/pkg-ex61-clearing-confirmed.xml","excludedPaths":0,"externalPaths":106,"outstandingMappings":13,"validationFailures":5,"qualificationExpectation":{"success":true,"qualifyResults":[{"qualifiedName":"InterestRate_IRSwap_FixedFloat","qualifiedObjectClass":"cdm.product.template.EconomicTerms"}],"qualifiableObjectCount":1}}]