cdm integration prep

Author: dschwartz-ftadvisory

.github/workflows/build-and-tag-release-rosetta-bundle.yml

@@ -2,7 +2,6 @@ name: Build and Tag with Rosetta Bundle Version
 
 on:
   workflow_dispatch:
-  # Optionally, you can trigger on push to main or other events
 
 jobs:
   build:
@@ -35,24 +34,17 @@ jobs:
       run: |
         curl -L -o cdm-pom.xml https://raw.githubusercontent.com/finos/common-domain-model/main/pom.xml
 
-    - name: Extract rosetta.bundle.version from external POM
+    - name: Extract rosetta.bundle.version from external POM using Maven
       id: extract_version
       run: |
-        # Try to extract from <properties> first, fallback to profile if needed
-        version=$(xmllint --xpath "string(//properties/rosetta.bundle.version)" cdm-pom.xml)
-        if [ -z "$version" ]; then
-          version=$(xmllint --xpath "string(//profile/properties/rosetta.bundle.version)" cdm-pom.xml)
-        fi
+        version=$(mvn -f cdm-pom.xml help:evaluate -Dexpression=rosetta.bundle.version -q -DforceStdout)
         echo "rosetta.bundle.version=$version"
         echo "version=$version" >> $GITHUB_OUTPUT
 
-    - name: Override rosetta.bundle.version in local pom.xml
+    - name: Update all rosetta.bundle.version properties in local pom.xml using Maven
       run: |
         version="${{ steps.extract_version.outputs.version }}"
-        # Replace in <properties>
-        sed -i "s|<rosetta.bundle.version>.*</rosetta.bundle.version>|<rosetta.bundle.version>${version}</rosetta.bundle.version>|" pom.xml
-        # Replace in <profile> (if present)
-        sed -i "s|<rosetta.bundle.version>.*</rosetta.bundle.version>|<rosetta.bundle.version>${version}</rosetta.bundle.version>|" pom.xml
+        mvn versions:set-property -Dproperty=rosetta.bundle.version -DnewVersion=$version -DprocessAllModules=true
 
     - name: Set POM version to rosetta.bundle.version
       run: |
@@ -63,8 +55,8 @@ jobs:
     - name: Build with Maven
       run: mvn -B package
 
-    - name: Revert POM changes
-      run: git checkout -- pom.xml
+    - name: Revert POM property changes
+      run: mvn versions:revert
 
     - name: Upload JAR files
       uses: actions/upload-artifact@v4

pom.xml

@@ -190,7 +190,7 @@
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
         <!-- Used by the Python generator -->
-        <cdm.rosetta.source.path>/Users/dls/projects/cdm/common-domain-model/trade-header/common-domain-model/rosetta-source/src/main/rosetta</cdm.rosetta.source.path>
+        <cdm.rosetta.source.path>[path to rosetta files]</cdm.rosetta.source.path>
         <cdm.python.output.path>target/python-cdm</cdm.python.output.path>
         <unittest.rosetta.source.path>test/python_unit_tests/rosetta</unittest.rosetta.source.path>
         <unittest.python.output.path>target/python-tests/unit_tests</unittest.python.output.path>

src/test/java/com/regnosys/rosetta/generator/python/PythonFilesGeneratorTest.xtend

@@ -37,7 +37,7 @@ class PythonFilesGeneratorTest {
     /*
      * generate CDM from Rosetta files.  Should be disabled for releases
      */
-//    @Disabled
+    @Disabled
     @Test
     def void generateCDMPythonFromRosetta() {
         try {

test/python_unit_tests/rosetta/BinaryOp.rosetta

@@ -1,6 +1,6 @@
 namespace rosetta_dsl.test.semantic.binary_op : <"generate Python unit tests from Rosetta.">
 
-type EqualsTest: <"    Test equals operation condition">
+type EqualsTest: <"Test equals operation condition">
     aValue int (1..1)
     target int (1..1)
     condition TestCond: <"Test condition">
@@ -9,7 +9,7 @@ type EqualsTest: <"    Test equals operation condition">
         else 
             False
 
-type NotEqualsTest: <"    Test not equals operation condition">
+type NotEqualsTest: <"Test not equals operation condition">
     aValue int (1..1)
     target int (1..1)
     condition TestCond: <"Test condition">
@@ -18,7 +18,7 @@ type NotEqualsTest: <"    Test not equals operation condition">
         else 
             False
 
-type ContainsTest: <"    Test contains operation condition">
+type ContainsTest: <"Test contains operation condition">
     aValue string (1..*)
     target string (1..1)
     condition TestCond: <"Test condition">
@@ -27,7 +27,7 @@ type ContainsTest: <"    Test contains operation condition">
         else 
             False
 
-type DisjointTest: <"    Test disjoint operation condition">
+type DisjointTest: <"Test disjoint operation condition">
     aValue string (1..*)
     target string (1..*)
     condition TestCond: <"Test condition">