[6xx] Update DSL (finos#3005)

* Update DSL * Add release notes * Fixed hamcrest * Updated DSL * Added hamcrest to deps * Fixed Windows build * Update DSL version to 9.12.4 --------- Co-authored-by: hugohills-regnosys <hugo.hills@regnosys.com>
rosetta-models · Jul 3, 2024 · 4f82e7f · 4f82e7f
1 parent 0c648db
commit 4f82e7f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 42 deletions.
diff --git a/.github/actions/maven-build/action.yml b/.github/actions/maven-build/action.yml
@@ -5,8 +5,8 @@ inputs:
   run-tests:
     description: Whether or not to run tests. The default is true.
     required: false
-    type: boolean
-    default: true
+    # type: boolean  - This is not supported (yet). All inputs are of type `string`. See https://github.com/actions/runner/issues/2238.
+    default: 'true'
 
 runs:
   using: "composite"
@@ -20,4 +20,4 @@ runs:
         cache: maven
     - name: Build with Maven
       shell: bash
-      run: mvn -B -U clean package${{ inputs.run-tests && '' || ' -DskipTests'  }}
+      run: mvn -B -U clean package${{ inputs.run-tests == 'false' && ' -DskipTests' || '' }}
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,40 +1,17 @@
-# _Product Model - Portfolio Return Terms_
-
-_Background_
-
-Purpose is to release a Dev version for Portfolio Return Terms, in which the components with [**deprecated**] annotation in current Prod version have been removed.
-As an indication, this release also contains a renaming of existing attributes in **ValuationDates**.
+# _Infrastructure - Dependency Update_
 
 _What is being released?_
 
-- removed [deprecated] attributes below from type **PriceReturnTerms** :
-  - **valuationPriceInitial** 
-  - and **valuationPriceFinal** 
-  - and **finalValuationPrice**
-- added attributes below to type **PerformancePayout** : that is core release to Dev of the same components previously released in Prod today :
-  - creation of new type **PorfolioReturnTerms** which extends **ReturnTerms**
-    - with existing types **PayerReceiver**
-    - also with existing type **PriceSchedule** to **PerformancePayout** used under three attribute names, and **NonNegativeQuantitySchedule** used for one, respectively : **initialValuationPrice**, **interimValuationPrice**, **finalValuationPrice** and **quantity**
-  - added the above new type to **PerformancePayout**
-  - added existing type **PriceSchedule** to **PerformancePayout** used under three attribute names : **initialValuationPrice**, **interimValuationPrice** and **finalValuationPrice** (that is to replace [**deprecated**] ones removed from **ReturnTerms**)
-  - updated type Basket with below changes :
-    - removed temporary **PorfolioBasketConsituent** of type **BasketConstituent**
-    - removed as well [deprecated] **basketConstituent** of type **Product**
-    - added instead new attribute **basketConstituent** of type **BasketConstituent**
-  - renamed attributes below in **ValuationDates** :
-    - **initialValuationDate** (instead of **valuationDatesInitial**)
-    - **interimValuationDate** (instead of **valuationDatesInterim**)
-    - **finalValuationDate** (instead of **valuationDatesFinal**)
-
-_Review directions_
-
-In the Rosetta platform, select the Textual Browser and inspect the change identified above.
-
-_Backward compatibility_
+This release updates the following dependencies.
 
-As an information, this release contains two sets of changes with no backward compabiltity :
+Version updates include:
+- `DSL` 9.12.0: this release fixes an issue where the `only exists` operator behaved unexpectedly when subtyping was involved. For further details see DSL release notes: https://github.com/finos/rune-dsl/releases/tag/9.12.0.
+- `DSL` 9.12.1: this patch fixes null pointers in the Java runtime of the `only exists` operator. For further details see DSL release notes: https://github.com/finos/rune-dsl/releases/tag/9.12.1.
+- `DSL` 9.12.2: this patch fixes a code generation bug in the Java generator. For further details see DSL release notes: https://github.com/finos/rune-dsl/releases/tag/9.12.2.
+- `DSL` 9.12.3: this patch fixes an issue where the code generator could freeze Rosetta. For further details see DSL release notes: https://github.com/finos/rune-dsl/releases/tag/9.12.3.
+- `DSL` 9.12.4: this patch fixed an issue with `only exists` on multi-cardinality inputs. For further details see DSL release notes: https://github.com/finos/rune-dsl/releases/tag/9.12.4.
+- `Jackson` 2.17.1: this release updates the library used to serialise/deserialise JSON.
 
-- removing [deprecated] components above mentioned
-- renaming of attribtues in ValuationDates above mentioned
+_Review Directions_
 
-The changes can be reviewed in PR: [#2974](https://github.com/finos/common-domain-model/pull/2974)
+The changes can be reviewed in PR: [#3005](https://github.com/finos/common-domain-model/pull/3005)
diff --git a/pom.xml b/pom.xml
@@ -81,9 +81,9 @@
 
         <repoServerHost>oss.sonatype.org</repoServerHost>
         <stagingTimeoutInMinutes>10</stagingTimeoutInMinutes>
-        <rosetta.bundle.version>11.10.3</rosetta.bundle.version>
+        <rosetta.bundle.version>11.11.8</rosetta.bundle.version>
         <rosetta.code-gen.version>${rosetta.bundle.version}</rosetta.code-gen.version>
-        <rosetta.dsl.version>9.11.2</rosetta.dsl.version>
+        <rosetta.dsl.version>9.12.4</rosetta.dsl.version>
 
         <xtext.version>2.27.0</xtext.version>
         <opengamma.strata.version>1.7.0</opengamma.strata.version>
@@ -92,7 +92,7 @@
         <jaxb.version>2.3.1</jaxb.version>
         <slf4j-api.version>2.0.7</slf4j-api.version>
         <guava.version>32.0.1-jre</guava.version>
-        <jackson.version>2.15.2</jackson.version>
+        <jackson.version>2.17.1</jackson.version>
 
         <!-- test -->
         <junit.version>5.9.1</junit.version>
@@ -275,7 +275,7 @@
                             <id>attach-sources</id>
                             <phase>package</phase>
                             <goals>
-                                <goal>jar</goal>
+                                <goal>jar-no-fork</goal>
                             </goals>
                         </execution>
                     </executions>
@@ -477,6 +477,11 @@
                 <artifactId>hamcrest</artifactId>
                 <version>${hamcrest.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-core</artifactId>
+                <version>${hamcrest.version}</version>
+            </dependency>
             <!-- plugins START -->
             <dependency>
                 <groupId>com.regnosys.rosetta</groupId>

diff --git a/rosetta-source/src/main/resources/build-resources/kotlin/kotlin-build-pom.xml b/rosetta-source/src/main/resources/build-resources/kotlin/kotlin-build-pom.xml
@@ -126,7 +126,7 @@
                         <id>attach-sources</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>jar</goal>
+                            <goal>jar-no-fork</goal>
                         </goals>
                     </execution>
                 </executions>