pkware · MariusVolkhart · Jun 25, 2026 · Jun 25, 2026
@@ -1 +1 @@
-v1.35.0
+v1.36.0
@@ -1,4 +1,4 @@
-From a2fe376e6c9254a6f4f5339ad0a4b96eb0dbf203 Mon Sep 17 00:00:00 2001
+From b0e756ce00e3de1fe8c039ba2fb997f3dec4096a Mon Sep 17 00:00:00 2001
 From: Marius Volkhart <marius.volkhart@pkware.com>
 Date: Thu, 21 May 2026 14:36:55 -0400
 Subject: [PATCH] Replace Jackson with Moshi
@@ -16,7 +16,7 @@ jackson-module-kotlin. Excludes temporal-envconfig (jackson-dataformat-toml).
 ---
  settings.gradle                               |  22 +-
  temporal-bom/build.gradle                     |   7 -
- temporal-sdk/build.gradle                     |  96 +-------
+ temporal-sdk/build.gradle                     | 100 +-------
  .../Jackson3JsonPayloadConverterTest.java     | 216 ------------------
  .../common/converter/CodecDataConverter.java  |   9 +-
  .../common/converter/DataConverter.java       |   4 +-
@@ -33,17 +33,17 @@ jackson-module-kotlin. Excludes temporal-envconfig (jackson-dataformat-toml).
  .../internal/common/InternalUtils.java        |   4 +-
  .../temporal/internal/common/NexusUtil.java   |  31 ++-
  .../history/LocalActivityMarkerMetadata.java  |  12 +-
+ .../internal/nexus/OperationToken.java        |  23 +-
  .../internal/nexus/OperationTokenType.java    |   5 -
  .../internal/nexus/OperationTokenUtil.java    |  21 +-
- .../nexus/WorkflowRunOperationToken.java      |  23 +-
  .../temporal/payload/codec/PayloadCodec.java  |   4 +-
  .../Jackson3JsonPayloadConverter.java         | 134 -----------
  .../ActivityHeartbeatThrottlingTest.java      |   4 +-
  .../JacksonJsonPayloadConverterTest.java      | 158 -------------
  .../MoshiJsonPayloadConverterTest.java        | 105 +++++++++
- .../internal/nexus/WorkflowRunTokenTest.java  |  39 ++--
+ .../internal/nexus/WorkflowRunTokenTest.java  |  37 ++-
  .../java/io/temporal/workflow/MemoTest.java   |   2 +-
- 29 files changed, 576 insertions(+), 900 deletions(-)
+ 29 files changed, 576 insertions(+), 902 deletions(-)
  delete mode 100644 temporal-sdk/src/jackson3Tests/java/io/temporal/common/converter/Jackson3JsonPayloadConverterTest.java
  create mode 100644 temporal-sdk/src/main/java/io/temporal/common/converter/DurationMillis.java
  create mode 100644 temporal-sdk/src/main/java/io/temporal/common/converter/DurationMillisAdapter.java
@@ -112,7 +112,7 @@ index e73d0d3..18f0c5c 100644
      }
  }
 diff --git a/temporal-sdk/build.gradle b/temporal-sdk/build.gradle
-index d80285a..4000b60 100644
+index 9e914e3..7ac071f 100644
 --- a/temporal-sdk/build.gradle
 +++ b/temporal-sdk/build.gradle
 @@ -2,7 +2,6 @@ description = '''Temporal Workflow Java SDK'''
@@ -231,7 +231,7 @@ index d80285a..4000b60 100644
  }
 
  task testResourceIndependent(type: Test) {
-@@ -172,36 +115,6 @@ testing {
+@@ -172,40 +115,6 @@ testing {
              }
          }
 
@@ -247,8 +247,10 @@ index d80285a..4000b60 100644
 -            targets {
 -                all {
 -                    testTask.configure {
--                        javaLauncher = javaToolchains.launcherFor {
--                            languageVersion = JavaLanguageVersion.of(17)
+-                        if (project.hasProperty("testJavaVersion")) {
+-                            javaLauncher = javaToolchains.launcherFor {
+-                                languageVersion = JavaLanguageVersion.of(project.property("testJavaVersion") as int)
+-                            }
 -                        }
 -                        shouldRunAfter(test)
 -                    }
@@ -257,18 +259,20 @@ index d80285a..4000b60 100644
 -        }
 -
 -        // Unlike virtualThreadTests, jackson3Tests source directly imports Jackson 3 types
--        // and java17 classes, so the compile task also needs a Java 17 compiler (not just
+-        // and java17 classes, so the compile task also needs a Java 17+ compiler (not just
 -        // the test launcher).
 -        tasks.named('compileJackson3TestsJava') {
--            javaCompiler = javaToolchains.compilerFor {
--                languageVersion = JavaLanguageVersion.of(17)
+-            if (project.hasProperty("testJavaVersion")) {
+-                javaCompiler = javaToolchains.compilerFor {
+-                    languageVersion = JavaLanguageVersion.of(project.property("testJavaVersion") as int)
+-                }
 -            }
 -        }
 -
          virtualThreadTests(JvmTestSuite) {
              targets {
                  all {
-@@ -242,6 +155,5 @@ testing {
+@@ -250,6 +159,5 @@ testing {
  }
 
  tasks.named('check') {
@@ -1353,6 +1357,50 @@ index 8e29a67..7aa5ded 100644
    private Duration backoff;
 
    public LocalActivityMarkerMetadata() {}
+diff --git a/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationToken.java b/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationToken.java
+index 4bd5635..f399a15 100644
+--- a/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationToken.java
++++ b/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationToken.java
+@@ -1,34 +1,21 @@
+ package io.temporal.internal.nexus;
+
+-import com.fasterxml.jackson.annotation.JsonInclude;
+-import com.fasterxml.jackson.annotation.JsonProperty;
++import com.squareup.moshi.Json;
+
+ /** Deserialized representation of a Nexus operation token. */
+ public class OperationToken {
+-  @JsonProperty("v")
+-  @JsonInclude(JsonInclude.Include.NON_NULL)
++  @Json(name = "v")
+   private final Integer version;
+
+-  @JsonProperty("t")
++  @Json(name = "t")
+   private final OperationTokenType type;
+
+-  @JsonProperty("ns")
++  @Json(name = "ns")
+   private final String namespace;
+
+-  @JsonProperty("wid")
++  @Json(name = "wid")
+   private final String workflowId;
+
+-  public OperationToken(
+-      @JsonProperty("t") Integer type,
+-      @JsonProperty("ns") String namespace,
+-      @JsonProperty("wid") String workflowId,
+-      @JsonProperty("v") Integer version) {
+-    this.type = OperationTokenType.fromValue(type);
+-    this.namespace = namespace;
+-    this.workflowId = workflowId;
+-    this.version = version;
+-  }
+-
+   public OperationToken(OperationTokenType type, String namespace, String workflowId) {
+     this.type = type;
+     this.namespace = namespace;
 diff --git a/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationTokenType.java b/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationTokenType.java
 index 11aa57a..46c7534 100644
 --- a/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationTokenType.java
@@ -1380,7 +1428,7 @@ index 11aa57a..46c7534 100644
      if (value == null) {
        return UNKNOWN;
 diff --git a/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationTokenUtil.java b/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationTokenUtil.java
-index 1f4869b..d448563 100644
+index 737a84a..70a2331 100644
 --- a/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationTokenUtil.java
 +++ b/temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationTokenUtil.java
 @@ -1,16 +1,14 @@
@@ -1400,80 +1448,42 @@ index 1f4869b..d448563 100644
  public class OperationTokenUtil {
 -  private static final ObjectMapper mapper = new ObjectMapper().registerModule(new Jdk8Module());
 -  private static final ObjectWriter ow = mapper.writer();
-+  private static final JsonAdapter<WorkflowRunOperationToken> tokenAdapter =
-+      MoshiJsonPayloadConverter.newDefaultMoshi().adapter(WorkflowRunOperationToken.class);
++  private static final JsonAdapter<OperationToken> tokenAdapter =
++      MoshiJsonPayloadConverter.newDefaultMoshi().adapter(OperationToken.class);
    private static final Base64.Decoder decoder = Base64.getUrlDecoder();
    private static final Base64.Encoder encoder = Base64.getUrlEncoder().withoutPadding();
 
-@@ -22,12 +20,11 @@ public class OperationTokenUtil {
-   public static WorkflowRunOperationToken loadWorkflowRunOperationToken(String operationToken) {
-     WorkflowRunOperationToken token;
+@@ -23,8 +21,7 @@ public class OperationTokenUtil {
+   public static OperationToken loadOperationToken(String operationToken) {
+     OperationToken token;
      try {
--      JavaType reference = mapper.getTypeFactory().constructType(WorkflowRunOperationToken.class);
+-      JavaType reference = mapper.getTypeFactory().constructType(OperationToken.class);
 -      token = mapper.readValue(decoder.decode(operationToken), reference);
 +      token = tokenAdapter.fromJson(new String(decoder.decode(operationToken)));
      } catch (Exception e) {
        throw new IllegalArgumentException("Failed to parse operation token: " + e.getMessage());
      }
+@@ -45,7 +42,7 @@ public class OperationTokenUtil {
+    */
+   public static OperationToken loadWorkflowRunOperationToken(String operationToken) {
+     OperationToken token = loadOperationToken(operationToken);
 -    if (!token.getType().equals(OperationTokenType.WORKFLOW_RUN)) {
 +    if (!OperationTokenType.WORKFLOW_RUN.equals(token.getType())) {
        throw new IllegalArgumentException(
            "Invalid workflow run token: incorrect operation token type: " + token.getType());
      }
-@@ -51,8 +48,8 @@ public class OperationTokenUtil {
+@@ -63,9 +60,9 @@ public class OperationTokenUtil {
 
    /** Generate a workflow run operation token from a workflow ID and namespace. */
    public static String generateWorkflowRunOperationToken(String workflowId, String namespace)
 -      throws JsonProcessingException {
--    String json = ow.writeValueAsString(new WorkflowRunOperationToken(namespace, workflowId));
 +      throws IOException {
-+    String json = tokenAdapter.toJson(new WorkflowRunOperationToken(namespace, workflowId));
+     String json =
+-        ow.writeValueAsString(
++        tokenAdapter.toJson(
+             new OperationToken(OperationTokenType.WORKFLOW_RUN, namespace, workflowId));
      return encoder.encodeToString(json.getBytes());
    }
-
-diff --git a/temporal-sdk/src/main/java/io/temporal/internal/nexus/WorkflowRunOperationToken.java b/temporal-sdk/src/main/java/io/temporal/internal/nexus/WorkflowRunOperationToken.java
-index 2c8d1ac..8f1d88c 100644
---- a/temporal-sdk/src/main/java/io/temporal/internal/nexus/WorkflowRunOperationToken.java
-+++ b/temporal-sdk/src/main/java/io/temporal/internal/nexus/WorkflowRunOperationToken.java
-@@ -1,33 +1,20 @@
- package io.temporal.internal.nexus;
-
--import com.fasterxml.jackson.annotation.JsonInclude;
--import com.fasterxml.jackson.annotation.JsonProperty;
-+import com.squareup.moshi.Json;
-
- public class WorkflowRunOperationToken {
--  @JsonProperty("v")
--  @JsonInclude(JsonInclude.Include.NON_NULL)
-+  @Json(name = "v")
-   private final Integer version;
-
--  @JsonProperty("t")
-+  @Json(name = "t")
-   private final OperationTokenType type;
-
--  @JsonProperty("ns")
-+  @Json(name = "ns")
-   private final String namespace;
-
--  @JsonProperty("wid")
-+  @Json(name = "wid")
-   private final String workflowId;
-
--  public WorkflowRunOperationToken(
--      @JsonProperty("t") Integer type,
--      @JsonProperty("ns") String namespace,
--      @JsonProperty("wid") String workflowId,
--      @JsonProperty("v") Integer version) {
--    this.type = OperationTokenType.fromValue(type);
--    this.namespace = namespace;
--    this.workflowId = workflowId;
--    this.version = version;
--  }
--
-   public WorkflowRunOperationToken(String namespace, String workflowId) {
-     this.type = OperationTokenType.WORKFLOW_RUN;
-     this.namespace = namespace;
 diff --git a/temporal-sdk/src/main/java/io/temporal/payload/codec/PayloadCodec.java b/temporal-sdk/src/main/java/io/temporal/payload/codec/PayloadCodec.java
 index ef164d3..617736c 100644
 --- a/temporal-sdk/src/main/java/io/temporal/payload/codec/PayloadCodec.java
@@ -1933,10 +1943,10 @@ index 0000000..a5d3315
 +  }
 +}
 diff --git a/temporal-sdk/src/test/java/io/temporal/internal/nexus/WorkflowRunTokenTest.java b/temporal-sdk/src/test/java/io/temporal/internal/nexus/WorkflowRunTokenTest.java
-index fbf14d2..79f402c 100644
+index 1f22fe8..d3d50eb 100644
 --- a/temporal-sdk/src/test/java/io/temporal/internal/nexus/WorkflowRunTokenTest.java
 +++ b/temporal-sdk/src/test/java/io/temporal/internal/nexus/WorkflowRunTokenTest.java
-@@ -1,43 +1,35 @@
+@@ -1,43 +1,36 @@
  package io.temporal.internal.nexus;
 
 -import com.fasterxml.jackson.core.JsonProcessingException;
@@ -1954,14 +1964,15 @@ index fbf14d2..79f402c 100644
 -      new ObjectMapper().registerModule(new Jdk8Module()).writer();
 -  private static final ObjectReader or =
 -      new ObjectMapper().registerModule(new Jdk8Module()).reader();
-+  private static final JsonAdapter<WorkflowRunOperationToken> tokenAdapter =
-+      MoshiJsonPayloadConverter.newDefaultMoshi().adapter(WorkflowRunOperationToken.class);
++  private static final JsonAdapter<OperationToken> tokenAdapter =
++      MoshiJsonPayloadConverter.newDefaultMoshi().adapter(OperationToken.class);
    private static final Base64.Encoder encoder = Base64.getUrlEncoder().withoutPadding();
 
    @Test
 -  public void serializeWorkflowRunToken() throws JsonProcessingException {
 +  public void serializeWorkflowRunToken() {
-     WorkflowRunOperationToken token = new WorkflowRunOperationToken("namespace", "workflowId");
+     OperationToken token =
+         new OperationToken(OperationTokenType.WORKFLOW_RUN, "namespace", "workflowId");
 -    String json = ow.writeValueAsString(token);
 -    final JsonNode node = new ObjectMapper().readTree(json);
 +    String json = tokenAdapter.toJson(token);
@@ -1982,26 +1993,24 @@ index fbf14d2..79f402c 100644
    @Test
    public void deserializeWorkflowRunTokenWithVersion() throws IOException {
      String json = "{\"t\":1,\"ns\":\"namespace\",\"wid\":\"workflowId\",\"v\":1}";
--    JavaType reference =
--        new ObjectMapper().getTypeFactory().constructType(WorkflowRunOperationToken.class);
--    WorkflowRunOperationToken token = new ObjectMapper().readValue(json.getBytes(), reference);
+-    JavaType reference = new ObjectMapper().getTypeFactory().constructType(OperationToken.class);
+-    OperationToken token = new ObjectMapper().readValue(json.getBytes(), reference);
 -    // Assert that the serialized JSON is as expected
-+    WorkflowRunOperationToken token = tokenAdapter.fromJson(json);
++    OperationToken token = tokenAdapter.fromJson(json);
      Assert.assertEquals(OperationTokenType.WORKFLOW_RUN, token.getType());
 -    Assert.assertEquals(new Integer(1), token.getVersion());
 +    Assert.assertEquals(Integer.valueOf(1), token.getVersion());
      Assert.assertEquals("namespace", token.getNamespace());
      Assert.assertEquals("workflowId", token.getWorkflowId());
    }
-@@ -45,10 +37,7 @@ public class WorkflowRunTokenTest {
+@@ -45,9 +38,7 @@ public class WorkflowRunTokenTest {
    @Test
    public void deserializeWorkflowRunToken() throws IOException {
      String json = "{\"t\":1,\"ns\":\"namespace\",\"wid\":\"workflowId\"}";
--    JavaType reference =
--        new ObjectMapper().getTypeFactory().constructType(WorkflowRunOperationToken.class);
--    WorkflowRunOperationToken token = new ObjectMapper().readValue(json.getBytes(), reference);
+-    JavaType reference = new ObjectMapper().getTypeFactory().constructType(OperationToken.class);
+-    OperationToken token = new ObjectMapper().readValue(json.getBytes(), reference);
 -    // Assert that the serialized JSON is as expected
-+    WorkflowRunOperationToken token = tokenAdapter.fromJson(json);
++    OperationToken token = tokenAdapter.fromJson(json);
      Assert.assertEquals(OperationTokenType.WORKFLOW_RUN, token.getType());
      Assert.assertNull(null, token.getVersion());
      Assert.assertEquals("namespace", token.getNamespace());

@@ -1,4 +1,4 @@
-From 0d7445d0e412cc0c1adb2da9aa9045bda946551f Mon Sep 17 00:00:00 2001
+From c92c4c63735c19badc6d9a0ad3e28b74947aa892 Mon Sep 17 00:00:00 2001
 From: Marius Volkhart <marius.volkhart@pkware.com>
 Date: Thu, 21 May 2026 14:41:44 -0400
 Subject: [PATCH] Remove GSON dependency
@@ -17,7 +17,7 @@ Remove dead fixStackTrace method from WorkflowExecutionUtils.
  delete mode 100644 temporal-sdk/src/main/java/io/temporal/common/converter/GsonJsonPayloadConverter.java
 
 diff --git a/temporal-sdk/build.gradle b/temporal-sdk/build.gradle
-index 4000b60..5d1e854 100644
+index 7ac071f..3e39f30 100644
 --- a/temporal-sdk/build.gradle
 +++ b/temporal-sdk/build.gradle
 @@ -5,7 +5,6 @@ dependencies {

@@ -1,4 +1,4 @@
-From 4b542cdcdaf56ab9e5d6e96f07c6d8bb14eae106 Mon Sep 17 00:00:00 2001
+From e0bd24eeff0ef8a51f4ca4ef64e4996be2d0b670 Mon Sep 17 00:00:00 2001
 From: Marius Volkhart <marius.volkhart@pkware.com>
 Date: Thu, 25 Jun 2026 12:18:14 -0400
 Subject: [PATCH] Replace grpc-netty-shaded with grpc-netty
@@ -68,7 +68,7 @@ index 1da1e24..9e0633c 100644
      api "io.grpc:grpc-services" //Standard gRPC HealthCheck Response class
      api "io.grpc:grpc-inprocess" //For the in-process time skipping test server
 diff --git a/temporal-serviceclient/src/main/java/io/temporal/serviceclient/ChannelManager.java b/temporal-serviceclient/src/main/java/io/temporal/serviceclient/ChannelManager.java
-index da39c74..b1b6f40 100644
+index 4d32633..91472d3 100644
 --- a/temporal-serviceclient/src/main/java/io/temporal/serviceclient/ChannelManager.java
 +++ b/temporal-serviceclient/src/main/java/io/temporal/serviceclient/ChannelManager.java
 @@ -5,7 +5,7 @@ import io.grpc.*;
@@ -81,7 +81,7 @@ index da39c74..b1b6f40 100644
  import io.temporal.api.workflowservice.v1.GetSystemInfoResponse.Capabilities;
  import io.temporal.internal.retryer.GrpcRetryer;
 diff --git a/temporal-serviceclient/src/main/java/io/temporal/serviceclient/ServiceStubsOptions.java b/temporal-serviceclient/src/main/java/io/temporal/serviceclient/ServiceStubsOptions.java
-index 0c3d8ae..8b156e7 100644
+index 5ab5ddc..1b6f4d9 100644
 --- a/temporal-serviceclient/src/main/java/io/temporal/serviceclient/ServiceStubsOptions.java
 +++ b/temporal-serviceclient/src/main/java/io/temporal/serviceclient/ServiceStubsOptions.java
 @@ -4,7 +4,7 @@ import com.google.common.base.MoreObjects;
@@ -93,7 +93,7 @@ index 0c3d8ae..8b156e7 100644
  import io.temporal.authorization.AuthorizationGrpcMetadataProvider;
  import io.temporal.authorization.AuthorizationTokenSupplier;
  import java.time.Duration;
-@@ -510,7 +510,7 @@ public class ServiceStubsOptions {
+@@ -531,7 +531,7 @@ public class ServiceStubsOptions {
      /**
       * Gives an opportunity to provide some additional configuration to the channel builder or
       * override configurations done by the Temporal Stubs. Currently, Temporal Stubs use {@link
@@ -102,7 +102,7 @@ index 0c3d8ae..8b156e7 100644
       *
       * <p>Advanced API
       *
-@@ -518,9 +518,8 @@ public class ServiceStubsOptions {
+@@ -539,9 +539,8 @@ public class ServiceStubsOptions {
       *
       * @param channelInitializer listener that will be called as a last step of channel creation if
       *     Stubs are configured with {@link Builder#setTarget(String)}. The listener is called with

@@ -1,4 +1,4 @@
-From 9c8aee90bc90d62c37f31f0ce0435fb837682785 Mon Sep 17 00:00:00 2001
+From fe9e23829a4eb5bf6900dfcd957bb74621992306 Mon Sep 17 00:00:00 2001
 From: Marius Volkhart <marius.volkhart@pkware.com>
 Date: Thu, 21 May 2026 14:53:54 -0400
 Subject: [PATCH] Change groupId to com.pkware.temporal

@@ -1,4 +1,4 @@
-From 091ae33efd46c9d4082921136703efb2767709ff Mon Sep 17 00:00:00 2001
+From 9adb640d5b4f6cda30a91dc6ca192287d9201705 Mon Sep 17 00:00:00 2001
 From: Marius Volkhart <marius.volkhart@pkware.com>
 Date: Thu, 28 May 2026 11:52:21 -0400
 Subject: [PATCH] Add Wire protobuf support
@@ -40,7 +40,7 @@ index 6dcbcc7..a304c21 100644
      id 'net.ltgt.errorprone' version '4.1.0' apply false
      id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
 diff --git a/temporal-sdk/build.gradle b/temporal-sdk/build.gradle
-index 5d1e854..1363a3d 100644
+index 3e39f30..7d33f70 100644
 --- a/temporal-sdk/build.gradle
 +++ b/temporal-sdk/build.gradle
 @@ -1,5 +1,18 @@