Merge pull request #79 from finos/main

sync with main

Author: dschwartznyc

.github/renovate.json

@@ -51,6 +51,15 @@
         "!com.regnosys.rosetta:com.regnosys.rosetta",
         "!rosetta.dsl.version"
       ]
-    }
+    },
+    {
+      "description": "Always open PRs immediately for Renovate GitHub Action updates",
+      "matchManagers": ["github-actions"],
+        "matchPackageNames": ["renovatebot/github-action"],
+        "prCreation": "immediate",
+        "stabilityDays": 0,
+        "minimumReleaseAge": "0 days",
+        "schedule": ["at any time"]
+    }    
   ]
 }

.github/workflows/build-and-test.yml

@@ -30,7 +30,7 @@ jobs:
 
       # Java
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: ${{ inputs.java-version }}

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
@@ -80,7 +80,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21

.github/workflows/renovate.yml

@@ -26,7 +26,7 @@ jobs:
 
       # Runs the Renovate GitHub Action
       - name: Renovate
-        uses: renovatebot/[email protected].10
+        uses: renovatebot/[email protected].12
         with:
           token: ${{ secrets.GITHUB_TOKEN }} # required to create PRs/issues
           configurationFile: .github/renovate.json

.github/workflows/run-build-and-test.yml

@@ -0,0 +1,23 @@
+# .github/workflows/run-build-and-test.yml
+
+name: Run Build and Test (manual)
+
+on:
+  workflow_dispatch:
+    inputs:
+      java-version:
+        description: Java version (Temurin)
+        required: false
+        default: '21'
+      python-version:
+        description: Python version
+        required: false
+        default: '3.11'
+
+jobs:
+  run-core-build-and-test:
+    uses: ./.github/workflows/build-and-test.yml
+    with:
+      java-version: ${{ inputs.java-version }}
+      python-version: ${{ inputs.python-version }}
+    secrets: inherit

.github/workflows/scan-cve.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
       - name: Setup JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'temurin'

.github/workflows/scan-license.yml

@@ -55,7 +55,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Set up JDK 21
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: 21
         cache: maven

pom.xml

@@ -81,7 +81,7 @@
         <repoServerHost>s01.oss.sonatype.org</repoServerHost>
         <stagingTimeoutInMinutes>20</stagingTimeoutInMinutes>
 
-        <rosetta.dsl.version>9.65.1</rosetta.dsl.version>
+        <rosetta.dsl.version>9.66.0</rosetta.dsl.version>
 
         <xtext.version>2.38.0</xtext.version>
         <guice.version>6.0.0</guice.version>
@@ -307,7 +307,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
-            <version>3.9.10</version>
+            <version>3.9.11</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

src/main/java/com/regnosys/rosetta/generator/python/object/PythonAttributeProcessor.xtend

@@ -198,7 +198,7 @@ class PythonAttributeProcessor {
         val otherMeta = new ArrayList<String>()
 
         // process attribute metadata
-        if (attrRMAT.hasMeta) {
+        if (attrRMAT.hasAttributeMeta) {
             attrRMAT.getMetaAttributes.forEach [ma |
                 switch(ma.getName) {
                     case "key", case "id": {

src/test/java/com/regnosys/rosetta/generator/python/generated_syntax/PythonMetaDataGeneratorTest.xtend

@@ -148,10 +148,10 @@ class PythonMetaDataGeneratorTest {
         class test_generated_syntax_metadata_NodeRef(BaseDataClass):
             _FQRTN = 'test.generated_syntax.metadata.NodeRef'
             typeA: Optional[Annotated[test_generated_syntax_metadata_A, test_generated_syntax_metadata_A.serializer(), test_generated_syntax_metadata_A.validator()]] = Field(None, description='')
-            aReference: Optional[Annotated[test_generated_syntax_metadata_A, test_generated_syntax_metadata_A.serializer(), test_generated_syntax_metadata_A.validator(('@ref', '@ref:external'))]] = Field(None, description='')
+            aReference: Optional[Annotated[test_generated_syntax_metadata_A, test_generated_syntax_metadata_A.serializer(), test_generated_syntax_metadata_A.validator(('@key', '@key:external', '@ref', '@ref:external'))]] = Field(None, description='')
             
             _KEY_REF_CONSTRAINTS = {
-                'aReference': {'@ref', '@ref:external'}
+                'aReference': {'@key', '@key:external', '@ref', '@ref:external'}
             }
         '''
         testUtils.assertGeneratedContainsExpectedString(generatedBundle, expectedNodeRef)