use dapr + update settings

client/build.gradle

@@ -13,7 +13,7 @@ version = '1.5.2'
 archivesBaseName = 'durabletask-client'
 
 def grpcVersion = '1.59.0'
-def protocVersion = '3.12.0'
+def protocVersion = '3.19.0'
 def jacksonVersion = '2.15.3'
 // When build on local, you need to set this value to your local jdk11 directory.
 // Java11 is used to compile and run all the tests.
@@ -58,14 +58,14 @@ task downloadProtoFiles {
         protoDir.mkdirs()
 
         // Download the proto file
-        new URL("https://raw.githubusercontent.com/microsoft/durabletask-protobuf/${ext.branch}/protos/orchestrator_service.proto")
+        new URL("https://raw.githubusercontent.com/dapr/durabletask-protobuf/${ext.branch}/protos/orchestrator_service.proto")
             .withInputStream { i -> 
                 new File(protoDir, 'orchestrator_service.proto').withOutputStream { it << i }
             }
 
         // Get and save the commit hash
         def commitHashFile = new File("${rootProject.projectDir}/internal/durabletask-protobuf/PROTO_SOURCE_COMMIT_HASH")
-        def commitApiUrl = new URL("https://api.github.com/repos/microsoft/durabletask-protobuf/commits?path=protos/orchestrator_service.proto&sha=${ext.branch}&per_page=1")
+        def commitApiUrl = new URL("https://api.github.com/repos/dapr/durabletask-protobuf/commits?path=protos/orchestrator_service.proto&sha=${ext.branch}&per_page=1")
         def connection = commitApiUrl.openConnection()
         connection.setRequestProperty('Accept', 'application/vnd.github.v3+json')
         def commitHash = new groovy.json.JsonSlurper().parse(connection.inputStream)[0].sha
@@ -74,7 +74,9 @@ task downloadProtoFiles {
 }
 
 protobuf {
-    protoc { artifact = "com.google.protobuf:protoc:${protocVersion}" }
+    protoc { 
+        artifact = "com.google.protobuf:protoc:${protocVersion}"
+    }
     plugins {
         grpc { artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" }
     }
@@ -136,7 +138,7 @@ publishing {
             pom {
                 name = 'Durable Task Client SDK for Java'
                 description = 'This package contains classes and interfaces for building Durable Task orchestrations in Java.'
-                url = "https://github.com/microsoft/durabletask-java/tree/main/client"
+                url = "https://github.com/dapr/durabletask-java/tree/main/client"
                 licenses {
                     license {
                         name = "MIT License"
@@ -146,14 +148,14 @@ publishing {
                 }
                 developers {
                     developer {
-                        id = "Microsoft"
-                        name = "Microsoft Corporation"
+                        id = "Dapr"
+                        name = "Dapr"
                     }
                 }
                 scm {
-                    connection = "scm:git:https://github.com/microsoft/durabletask-java"
-                    developerConnection = "scm:git:[email protected]:microsoft/durabletask-java"
-                    url = "https://github.com/microsoft/durabletask-java/tree/main/client"
+                    connection = "scm:git:https://github.com/dapr/durabletask-java"
+                    developerConnection = "scm:git:[email protected]:dapr/durabletask-java"
+                    url = "https://github.com/dapr/durabletask-java/tree/main/client"
                 }
                 // use below script to include compile-only dependencies when generated pom file.
                 // This is pain point when we onboard API docs as the missing compile-only dependencies crash the
@@ -174,8 +176,11 @@ publishing {
 }
 
 signing {
-   required = !project.hasProperty("skipSigning")
-   sign publishing.publications.mavenJava
+    sign publishing.publications.mavenJava
+    useInMemoryPgpKeys(
+            findProperty("GPG_KEY"),
+            findProperty("GPG_PWD")
+    )
 }
 
 java {

client/spotbugs-exclude.xml

@@ -2,7 +2,7 @@
 <FindBugsFilter>
     <!-- Exclude generated protobuf code -->
     <Match>
-        <Package name="com.microsoft.durabletask.protobuf"/>
+        <Package name="io.dapr.durabletask.protobuf"/>
     </Match>
 
     <!-- Exclude test classes -->

client/src/main/java/com/microsoft/durabletask/CompositeTaskFailedException.java → client/src/main/java/io/dapr/durabletask/CompositeTaskFailedException.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import java.util.ArrayList;
 import java.util.List;

client/src/main/java/com/microsoft/durabletask/DataConverter.java → client/src/main/java/io/dapr/durabletask/DataConverter.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.Timestamp;
 

client/src/main/java/com/microsoft/durabletask/DurableTaskClient.java → client/src/main/java/io/dapr/durabletask/DurableTaskClient.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.time.Duration;

client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcClient.java → client/src/main/java/io/dapr/durabletask/DurableTaskGrpcClient.java

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.StringValue;
 import com.google.protobuf.Timestamp;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.*;
-import com.microsoft.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc;
-import com.microsoft.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc.*;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.*;
+import io.dapr.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc;
+import io.dapr.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc.*;
 
 import io.grpc.*;
 

client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcClientBuilder.java → client/src/main/java/io/dapr/durabletask/DurableTaskGrpcClientBuilder.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import io.grpc.Channel;
 

client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcWorker.java → client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorker.java

@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.StringValue;
 
-import com.microsoft.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.*;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.WorkItem.RequestCase;
-import com.microsoft.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc.*;
+import io.dapr.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.*;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.WorkItem.RequestCase;
+import io.dapr.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc.*;
 
 import io.grpc.*;
 

client/src/main/java/com/microsoft/durabletask/DurableTaskGrpcWorkerBuilder.java → client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorkerBuilder.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import io.grpc.Channel;
 

client/src/main/java/com/microsoft/durabletask/FailureDetails.java → client/src/main/java/io/dapr/durabletask/FailureDetails.java

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.StringValue;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.TaskFailureDetails;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.TaskFailureDetails;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

client/src/main/java/com/microsoft/durabletask/Helpers.java → client/src/main/java/io/dapr/durabletask/Helpers.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

client/src/main/java/com/microsoft/durabletask/JacksonDataConverter.java → client/src/main/java/io/dapr/durabletask/JacksonDataConverter.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

client/src/main/java/com/microsoft/durabletask/NewOrchestrationInstanceOptions.java → client/src/main/java/io/dapr/durabletask/NewOrchestrationInstanceOptions.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import java.time.Instant;
 

client/src/main/java/com/microsoft/durabletask/NonDeterministicOrchestratorException.java → client/src/main/java/io/dapr/durabletask/NonDeterministicOrchestratorException.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 final class NonDeterministicOrchestratorException extends RuntimeException {
     public NonDeterministicOrchestratorException(String message) {

client/src/main/java/com/microsoft/durabletask/OrchestrationMetadata.java → client/src/main/java/io/dapr/durabletask/OrchestrationMetadata.java

@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.OrchestrationState;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationState;
 
 import java.time.Instant;
 
-import static com.microsoft.durabletask.Helpers.isNullOrEmpty;
+import static io.dapr.durabletask.Helpers.isNullOrEmpty;
 
 /**
  * Represents a snapshot of an orchestration instance's current state, including metadata.

client/src/main/java/com/microsoft/durabletask/OrchestrationRunner.java → client/src/main/java/io/dapr/durabletask/OrchestrationRunner.java

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.StringValue;
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
 
 import java.time.Duration;
 import java.util.Base64;

client/src/main/java/com/microsoft/durabletask/OrchestrationRuntimeStatus.java → client/src/main/java/io/dapr/durabletask/OrchestrationRuntimeStatus.java

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
-import com.microsoft.durabletask.implementation.protobuf.OrchestratorService.*;
-import static com.microsoft.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.*;
+import io.dapr.durabletask.implementation.protobuf.OrchestratorService.*;
+import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.*;
 
 /**
  * Enum describing the runtime status of the orchestration.

client/src/main/java/com/microsoft/durabletask/OrchestrationStatusQuery.java → client/src/main/java/io/dapr/durabletask/OrchestrationStatusQuery.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.time.Instant;

client/src/main/java/com/microsoft/durabletask/OrchestrationStatusQueryResult.java → client/src/main/java/io/dapr/durabletask/OrchestrationStatusQueryResult.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.util.List;

client/src/main/java/com/microsoft/durabletask/OrchestratorFunction.java → client/src/main/java/io/dapr/durabletask/OrchestratorFunction.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Functional interface for inline orchestrator functions.

client/src/main/java/com/microsoft/durabletask/PurgeInstanceCriteria.java → client/src/main/java/io/dapr/durabletask/PurgeInstanceCriteria.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.time.Duration;

client/src/main/java/com/microsoft/durabletask/PurgeResult.java → client/src/main/java/io/dapr/durabletask/PurgeResult.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Class representing the results of an orchestration state purge operation.

client/src/main/java/com/microsoft/durabletask/RetryContext.java → client/src/main/java/io/dapr/durabletask/RetryContext.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import java.time.Duration;
 

client/src/main/java/com/microsoft/durabletask/RetryHandler.java → client/src/main/java/io/dapr/durabletask/RetryHandler.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Functional interface for implementing custom task retry handlers.

client/src/main/java/com/microsoft/durabletask/RetryPolicy.java → client/src/main/java/io/dapr/durabletask/RetryPolicy.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import javax.annotation.Nullable;
 import java.time.Duration;

client/src/main/java/com/microsoft/durabletask/Task.java → client/src/main/java/io/dapr/durabletask/Task.java

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
-import com.microsoft.durabletask.interruption.OrchestratorBlockedException;
+import io.dapr.durabletask.interruption.OrchestratorBlockedException;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;

client/src/main/java/com/microsoft/durabletask/TaskActivity.java → client/src/main/java/io/dapr/durabletask/TaskActivity.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Common interface for task activity implementations.

client/src/main/java/com/microsoft/durabletask/TaskActivityContext.java → client/src/main/java/io/dapr/durabletask/TaskActivityContext.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Interface that provides {@link TaskActivity} implementations with activity context, such as an activity's name and

client/src/main/java/com/microsoft/durabletask/TaskActivityExecutor.java → client/src/main/java/io/dapr/durabletask/TaskActivityExecutor.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 import java.util.HashMap;
 import java.util.logging.Logger;

client/src/main/java/com/microsoft/durabletask/TaskActivityFactory.java → client/src/main/java/io/dapr/durabletask/TaskActivityFactory.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Factory interface for producing {@link TaskActivity} implementations.

client/src/main/java/com/microsoft/durabletask/TaskCanceledException.java → client/src/main/java/io/dapr/durabletask/TaskCanceledException.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 // TODO: This should inherit from Exception, not TaskFailedException
 /**

client/src/main/java/com/microsoft/durabletask/TaskFailedException.java → client/src/main/java/io/dapr/durabletask/TaskFailedException.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Exception that gets thrown when awaiting a {@link Task} for an activity or sub-orchestration that fails with an

client/src/main/java/com/microsoft/durabletask/TaskOptions.java → client/src/main/java/io/dapr/durabletask/TaskOptions.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Options that can be used to control the behavior of orchestrator and activity task execution.

client/src/main/java/com/microsoft/durabletask/TaskOrchestration.java → client/src/main/java/io/dapr/durabletask/TaskOrchestration.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.microsoft.durabletask;
+package io.dapr.durabletask;
 
 /**
  * Common interface for task orchestrator implementations.