Merge remote-tracking branch 'origin/main' into feature/redis-health-indicator

Author: phgbecker

.github/workflows/ci.yml

@@ -55,12 +55,12 @@ jobs:
         with:
           report_paths: "**/build/test-results/test/TEST-*.xml"
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: "**/build/reports"
       - name: Store Buildscan URL
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-scan
           path: "buildscan.log"
@@ -95,14 +95,14 @@ jobs:
           component: true
 
       - name: Archive test screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots
           path: ui/cypress/screenshots
 
       - name: Archive test videos
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: cypress-videos

conductor-clients/java/conductor-java-sdk/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [4.0.0] - 2024-10-09
+- New major release – [Read more](https://orkes.io/blog/conductor-java-client-v4/)
+
+## [4.0.1] - 2024-10-30
+- Improve Spring modules with auto-configuration - https://github.com/conductor-oss/conductor/pull/287
+- Added Jackson Kotlin module to client ObjectMapper - https://github.com/conductor-oss/conductor/pull/294
+- Fix chronounit issue in java sdk - https://github.com/conductor-oss/conductor/pull/298
+
+## [4.0.2] - 2024-12-09
+- Added ZoneId to `SaveScheduleRequest` - https://github.com/conductor-oss/conductor/pull/302
+- Add callTimeout field to ConductorClient builder - https://github.com/conductor-oss/conductor/pull/317
+- Task poll update v2 - https://github.com/conductor-oss/conductor/pull/328
+
+## [4.0.3] - 2024-12-17
+- Add testWorkflow to OrkesWorkflowClient - https://github.com/conductor-oss/conductor/pull/333
+
+## [4.0.4] - 2025-01-07
+- Added lease extension to java sdk and fixed tests - https://github.com/conductor-oss/conductor/pull/349
+- Unify environment variable usage - https://github.com/conductor-oss/conductor/pull/353
+- Add support for configurable MetricsCollector in Spring client - https://github.com/conductor-oss/conductor/pull/356

conductor-clients/java/conductor-java-sdk/conductor-client/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java

@@ -34,6 +34,9 @@ public class SubWorkflowParams {
 
     private IdempotencyStrategy idempotencyStrategy;
 
+    // Priority of the sub workflow, not set inherits from the parent
+    private Integer priority;
+
     public String getIdempotencyKey() {
         return idempotencyKey;
     }
@@ -150,4 +153,12 @@ public boolean equals(Object o) {
         SubWorkflowParams that = (SubWorkflowParams) o;
         return Objects.equals(getName(), that.getName()) && Objects.equals(getVersion(), that.getVersion()) && Objects.equals(getTaskToDomain(), that.getTaskToDomain()) && Objects.equals(getWorkflowDefinition(), that.getWorkflowDefinition());
     }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
 }