diff --git a/build.gradle b/build.gradle index 67f403c660..6ffc28a627 100644 --- a/build.gradle +++ b/build.gradle @@ -11,12 +11,12 @@ ext { // We have to use specific versions with platforms until Maven 4.0.0 is released // See https://github.com/temporalio/sdk-java/issues/1033 // - // grpcVersion = '[1.34.0,)!!1.44.0' + // grpcVersion = '[1.34.0,)!!1.44.1' // jacksonVersion = '[2.9.0,)!!2.13.1' - // micrometerVersion = '[1.0.0,)!!1.8.2' - grpcVersion = '1.44.0' + // micrometerVersion = '[1.0.0,)!!1.8.3' + grpcVersion = '1.44.1' jacksonVersion = '2.13.1' - micrometerVersion = '1.8.2' + micrometerVersion = '1.8.3' logbackVersion = '1.2.10' protoVersion = '[3.10.0,)!!3.19.4' @@ -24,8 +24,8 @@ ext { jsonPathVersion = '2.7.0' mockitoVersion = '4.3.1' tallyVersion = '[0.4.0,)!!0.11.1' - gsonVersion = '[2.0,)!!2.8.9' - slf4jVersion = '[1.4.0,)!!1.7.35' + gsonVersion = '[2.0,)!!2.9.0' + slf4jVersion = '[1.4.0,)!!1.7.36' } apply from: "$rootDir/gradle/versioning.gradle" diff --git a/temporal-sdk/src/main/java/io/temporal/internal/replay/ReplayWorkflowRunTaskHandler.java b/temporal-sdk/src/main/java/io/temporal/internal/replay/ReplayWorkflowRunTaskHandler.java index d6b5e43850..d42cd72108 100644 --- a/temporal-sdk/src/main/java/io/temporal/internal/replay/ReplayWorkflowRunTaskHandler.java +++ b/temporal-sdk/src/main/java/io/temporal/internal/replay/ReplayWorkflowRunTaskHandler.java @@ -170,7 +170,6 @@ private void handleWorkflowTaskImpl(PollWorkflowTaskQueueResponseOrBuilder workf workflowTask, toJavaDuration(startedEvent.getWorkflowTaskTimeout()), metricsScope); - statesMachinesCallback.workflowHistoryIterator = historyEvents; while (historyEvents.hasNext()) { HistoryEvent event = historyEvents.next(); workflowStateMachines.handleEvent(event, historyEvents.hasNext()); @@ -309,8 +308,6 @@ private void waitAndProcessLocalActivityCompletion(long nextForcedDecisionTime) private class StatesMachinesCallbackImpl implements StatesMachinesCallback { - private WorkflowHistoryIterator workflowHistoryIterator; - @Override public void start(HistoryEvent startWorkflowEvent) { replayWorkflowExecutor.start(startWorkflowEvent); diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/DeadlockDetectorTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/DeadlockDetectorTest.java index fed3258330..fc28bf0821 100644 --- a/temporal-sdk/src/test/java/io/temporal/workflow/DeadlockDetectorTest.java +++ b/temporal-sdk/src/test/java/io/temporal/workflow/DeadlockDetectorTest.java @@ -152,6 +152,6 @@ private void initDebugMode() { @Parameterized.Parameters public static Collection debugModeParams() { - return Arrays.asList(true, false); + return Arrays.asList(false, true); } } diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/WaitingWorkflowQueryTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/WaitingWorkflowQueryTest.java index c072ddfde1..04029e7b2d 100644 --- a/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/WaitingWorkflowQueryTest.java +++ b/temporal-sdk/src/test/java/io/temporal/workflow/queryTests/WaitingWorkflowQueryTest.java @@ -28,7 +28,6 @@ import io.temporal.workflow.Workflow; import io.temporal.workflow.shared.TestWorkflows; import java.time.Duration; -import java.util.*; import java.util.concurrent.ExecutionException; import org.junit.Rule; import org.junit.Test; @@ -75,7 +74,7 @@ public String execute() { @Override public String query() { - return queryResult.toString(); + return queryResult; } } }