merge main updates

.github/renovate.json

@@ -62,7 +62,6 @@
       ],
       "prCreation": "immediate",
       "prPriority": 100,
-      "stabilityDays": 0,
       "minimumReleaseAge": "0 days",
       "schedule": [
         "at any time"
@@ -87,4 +86,4 @@
       "dependencyDashboardApproval": true
     }
   ]
-}
+}

.github/workflows/release.yml

@@ -183,7 +183,7 @@ jobs:
 
     - name: In dry run - upload build outputs as workflow artifacts
       if: ${{ github.event.inputs.dry_run == 'true' }}
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: dry-run-${{ needs.prepare-release.outputs.tag_name }}
         path: |

.github/workflows/scan-cve.yml

@@ -53,7 +53,7 @@ jobs:
             --out ./reports
       - name: Upload Test results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: Depcheck report
           path:  ${{github.workspace}}/reports

.github/workflows/scan-license.yml

@@ -82,7 +82,7 @@ jobs:
         if [ $LINES_FOUND -gt 1 ]; then echo $LICENSE_REPORT ; exit -1; fi
       working-directory: .
     - name: Upload license XML reports
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: license-xml-report
         path: './**/${{ env.REPORT_PATH }}'

pom.xml

@@ -71,8 +71,8 @@
         <java.enforced.version>[21,22)</java.enforced.version>
         <maven.compiler.release>21</maven.compiler.release>
 
-        <apache.commons.lang.version>3.19.0</apache.commons.lang.version>
-        <apache.commons.text.version>1.11.0</apache.commons.text.version>
+        <apache.commons.lang.version>3.20.0</apache.commons.lang.version>
+        <apache.commons.text.version>1.15.0</apache.commons.text.version>
         <commons-io.version>2.21.0</commons-io.version>
         <guava.version>33.3.1-jre</guava.version>
 
@@ -81,31 +81,31 @@
         <repoServerHost>s01.oss.sonatype.org</repoServerHost>
         <stagingTimeoutInMinutes>20</stagingTimeoutInMinutes>
 
-        <rosetta.dsl.version>9.75.3</rosetta.dsl.version>
+        <rosetta.dsl.version>9.77.1</rosetta.dsl.version>
 
-        <xtext.version>2.38.0</xtext.version>
+        <xtext.version>2.41.0</xtext.version>
         <guice.version>6.0.0</guice.version>
 
         <slf4j.version>2.0.17</slf4j.version>
-        <logback.version>1.5.21</logback.version>
+        <logback.version>1.5.32</logback.version>
 
         <!-- test -->
-        <junit.version>6.0.1</junit.version>
+        <junit.version>6.0.3</junit.version>
         <hamcrest.version>3.0</hamcrest.version>
 
         <!-- plugin -->
         <maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
         <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
         <maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
-        <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.5.5</maven-surefire-plugin.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <maven-install-plugin.version>3.1.4</maven-install-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
         <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
         <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
-        <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+        <maven-resources-plugin.version>3.5.0</maven-resources-plugin.version>
         <!-- Used by the Python generator -->
         <cdm.rosetta.source.path>build/common-domain-model/rosetta-source/src/main/rosetta</cdm.rosetta.source.path>
         <cdm.python.output.path>target/python-cdm</cdm.python.output.path>
@@ -294,7 +294,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>26.0.2-1</version>
+            <version>26.1.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -424,7 +424,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.6.2</version>
                 <configuration>
                     <createDependencyReducedPom>true</createDependencyReducedPom>
                 </configuration>

src/main/java/com/regnosys/rosetta/generator/python/PythonCodeGenerator.java

@@ -97,11 +97,27 @@ public class PythonCodeGenerator extends AbstractExternalGenerator {
 
     private Map<String, PythonCodeGeneratorContext> contexts = null;
 
+    /**
+     * Optional override for the pyproject.toml project name.
+     * When null, the name is derived from the namespace as "python-&lt;first-segment&gt;".
+     */
+    private String projectName = null;
+
     public PythonCodeGenerator() {
         super(PYTHON);
         contexts = new HashMap<>();
     }
 
+    /**
+     * Overrides the pyproject.toml project name. When not set (or set to null),
+     * the name is derived from the namespace as "python-&lt;first-segment&gt;".
+     *
+     * @param projectName the project name, or null for default behaviour
+     */
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
     @Override
     public Map<String, ? extends CharSequence> beforeAllGenerate(ResourceSet set,
             Collection<? extends RosettaModel> models, String version) {
@@ -180,7 +196,7 @@ private Map<String, CharSequence> processDAG(String nameSpace, PythonCodeGenerat
         Set<String> enumImports = context.getEnumImports();
 
         if (nameSpaceObjects != null && !nameSpaceObjects.isEmpty() && dependencyDAG != null && enumImports != null) {
-            result.put(PYPROJECT_TOML, PythonCodeGeneratorUtil.createPYProjectTomlFile(nameSpace, cleanVersion));
+            result.put(PYPROJECT_TOML, PythonCodeGeneratorUtil.createPYProjectTomlFile(nameSpace, cleanVersion, projectName));
             PythonCodeWriter bundleWriter = new PythonCodeWriter();
             TopologicalOrderIterator<String, DefaultEdge> topologicalOrderIterator = new TopologicalOrderIterator<>(
                     dependencyDAG);