Merge remote-tracking branch 'core/main' into taskinteraction_

Author: antmendoza

.github/workflows/gradle-wrapper-validation.yml

@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/wrapper-validation-action@v3

build.gradle

@@ -28,7 +28,7 @@ subprojects {
     ext {
         otelVersion = '1.30.1'
         otelVersionAlpha = "${otelVersion}-alpha"
-        javaSDKVersion = '1.23.1'
+        javaSDKVersion = '1.23.2'
         camelVersion = '3.22.1'
         jarVersion = '1.0.0'
     }

core/build.gradle

@@ -5,13 +5,13 @@ dependencies {
     testImplementation("io.temporal:temporal-testing:$javaSDKVersion")
 
     // Needed for SDK related functionality
-    implementation(platform("com.fasterxml.jackson:jackson-bom:2.17.0"))
+    implementation(platform("com.fasterxml.jackson:jackson-bom:2.17.1"))
     implementation "com.fasterxml.jackson.core:jackson-databind"
     implementation "com.fasterxml.jackson.core:jackson-core"
 
     implementation "io.micrometer:micrometer-registry-prometheus"
 
-    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.3'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.6'
     implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.9.0'
 
     implementation(platform("io.opentelemetry:opentelemetry-bom:$otelVersion"))
@@ -24,9 +24,9 @@ dependencies {
 
     // Used in samples
     implementation group: 'commons-configuration', name: 'commons-configuration', version: '1.10'
-    implementation group: 'io.cloudevents', name: 'cloudevents-core', version: '2.5.0'
-    implementation group: 'io.cloudevents', name: 'cloudevents-api', version: '2.5.0'
-    implementation group: 'io.cloudevents', name: 'cloudevents-json-jackson', version: '2.5.0'
+    implementation group: 'io.cloudevents', name: 'cloudevents-core', version: '3.0.0'
+    implementation group: 'io.cloudevents', name: 'cloudevents-api', version: '3.0.0'
+    implementation group: 'io.cloudevents', name: 'cloudevents-json-jackson', version: '3.0.0'
     implementation group: 'io.serverlessworkflow', name: 'serverlessworkflow-api', version: '4.0.5.Final'
     implementation group: 'io.serverlessworkflow', name: 'serverlessworkflow-validation', version: '4.0.5.Final'
     implementation group: 'io.serverlessworkflow', name: 'serverlessworkflow-spi', version: '4.0.5.Final'
@@ -46,7 +46,7 @@ dependencies {
 
     dependencies {
         errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
-        errorprone('com.google.errorprone:error_prone_core:2.26.1')
+        errorprone('com.google.errorprone:error_prone_core:2.27.1')
     }
 }
 

springboot-basic/build.gradle

@@ -10,9 +10,9 @@ dependencies {
     dependencies {
         errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
         if (JavaVersion.current().isJava11Compatible()) {
-            errorprone('com.google.errorprone:error_prone_core:2.26.1')
+            errorprone('com.google.errorprone:error_prone_core:2.27.1')
         } else {
-            errorprone('com.google.errorprone:error_prone_core:2.26.1')
+            errorprone('com.google.errorprone:error_prone_core:2.27.1')
         }
     }
 }

springboot/build.gradle

@@ -16,7 +16,7 @@ dependencies {
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     dependencies {
         errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
-        errorprone('com.google.errorprone:error_prone_core:2.26.1')
+        errorprone('com.google.errorprone:error_prone_core:2.27.1')
     }
 }
 

springboot/src/main/java/io/temporal/samples/springboot/camel/CamelRoutes.java

@@ -29,6 +29,7 @@
 public class CamelRoutes extends RouteBuilder {
 
   @Autowired private WorkflowClient workflowClient;
+  @Autowired OrderRepository repository;
 
   @Override
   public void configure() {
@@ -47,5 +48,13 @@ public void configure() {
               exchange.getIn().setBody(workflow.start());
             })
         .end();
+
+    from("direct:findAllOrders")
+        .routeId("direct-findAllOrders")
+        .process(
+            exchange -> {
+              exchange.getIn().setBody(repository.findAll());
+            })
+        .end();
   }
 }

springboot/src/main/java/io/temporal/samples/springboot/camel/OrderActivityImpl.java

@@ -21,17 +21,22 @@
 
 import io.temporal.spring.boot.ActivityImpl;
 import java.util.List;
+import org.apache.camel.ProducerTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 @ActivityImpl(taskQueues = "CamelSampleTaskQueue")
 public class OrderActivityImpl implements OrderActivity {
 
-  @Autowired OrderRepository repository;
+  @Autowired private ProducerTemplate producerTemplate;
 
   @Override
   public List<OfficeOrder> getOrders() {
-    return repository.findAll();
+    producerTemplate.start();
+    List<OfficeOrder> orders =
+        producerTemplate.requestBody("direct:findAllOrders", null, List.class);
+    producerTemplate.stop();
+    return orders;
   }
 }

springboot/src/main/java/io/temporal/samples/springboot/camel/README.md

@@ -8,5 +8,5 @@
 
        http://localhost:3030/orders
 
-This sample starts an Apache Camel route which runs our orders Workflow. 
-Results of the workflow are returned by the Camel route
+This sample starts an Apache Camel route which starts our orders Workflow.
+The workflow starts an activity which starts Camel route to get all orders JPA.