Skip to content

Commit 64afdbd

Browse files
cicoylecicoyle
authored
Merge branch 'master' into actor_ttl
2 parents 8423c5d + 1b37a1c commit 64afdbd

File tree

21 files changed

+381
-381
lines changed

21 files changed

+381
-381
lines changed

‎.github/scripts/create-release.sh‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -84,26 +84,26 @@ fi
8484
echo "$RELEASE_BRANCH branch is ready."
8585

8686
if [ `git rev-parse --verify $RELEASE_TAG 2>/dev/null` ]; then
87-
echo "$RELEASE_TAG tag already exists, aborting ..."
88-
exit 2
89-
fi
90-
91-
${script_dir}/update_sdk_version.sh $REL_VERSION
92-
git commit -s -m "Release $REL_VERSION" -a
93-
if [ "$VARIANT" = "" ]; then
94-
echo "Generating docs ..."
95-
${script_dir}/update_docs.sh $REL_VERSION
96-
git commit -s -m "Generate updated javadocs for $REL_VERSION" -a
97-
fi
98-
git push origin $RELEASE_BRANCH
87+
echo "$RELEASE_TAG tag already exists, checking it out ..."
88+
git checkout $RELEASE_TAG
89+
else
90+
${script_dir}/update_sdk_version.sh $REL_VERSION
91+
git commit -s -m "Release $REL_VERSION" -a
92+
if [ "$VARIANT" = "" ]; then
93+
echo "Generating docs ..."
94+
${script_dir}/update_docs.sh $REL_VERSION
95+
git commit -s -m "Generate updated javadocs for $REL_VERSION" -a
96+
fi
97+
git push origin $RELEASE_BRANCH
9998

100-
echo "Tagging $RELEASE_TAG ..."
101-
git tag $RELEASE_TAG
102-
echo "$RELEASE_TAG is tagged."
99+
echo "Tagging $RELEASE_TAG ..."
100+
git tag $RELEASE_TAG
101+
echo "$RELEASE_TAG is tagged."
103102

104-
echo "Pushing $RELEASE_TAG tag ..."
105-
git push origin $RELEASE_TAG
106-
echo "$RELEASE_TAG tag is pushed."
103+
echo "Pushing $RELEASE_TAG tag ..."
104+
git push origin $RELEASE_TAG
105+
echo "$RELEASE_TAG tag is pushed."
106+
fi
107107

108108
if [ "$VARIANT" = "" ]; then
109109
git clean -xdf

‎.github/scripts/update_docs.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ rm -f daprdocs/content/en/java-sdk-docs/_index.mdbak || echo
2727
rm -f daprdocs/content/en/java-sdk-docs/spring-boot/_index.md/_index.mdbak || echo
2828

2929
rm -rf docs
30-
./mvnw -Dmaven.test.skip=false -Djacoco.skip=true clean install
31-
./mvnw site-deploy
30+
./mvnw -Dmaven.test.skip=true -Djacoco.skip=true clean install
31+
./mvnw -Dmaven.test.skip=true -Djacoco.skip=true site-deploy

‎.github/workflows/create-release.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,18 @@ jobs:
2525
create-release:
2626
name: Creates release branch and tag
2727
runs-on: ubuntu-latest
28+
env:
29+
JDK_VER: '17'
2830
steps:
2931
- name: Check out code
3032
uses: actions/checkout@v4
3133
with:
3234
fetch-depth: 0
35+
- name: Set up OpenJDK ${{ env.JDK_VER }}
36+
uses: actions/setup-java@v4
37+
with:
38+
distribution: 'temurin'
39+
java-version: ${{ env.JDK_VER }}
3340
- name: Install required packages
3441
run: |
3542
sudo apt-get update

‎daprdocs/content/en/java-sdk-docs/java-client/_index.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,6 @@ public class DistributedLockGrpcClient {
496496

497497
### Workflow
498498

499-
> Dapr Workflow is currently in beta state.
500-
501499
```java
502500
package io.dapr.examples.workflows;
503501

‎daprdocs/content/en/java-sdk-docs/java-workflow/java-workflow-howto.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ weight: 20000
66
description: How to get up and running with workflows using the Dapr Java SDK
77
---
88

9-
{{% alert title="Note" color="primary" %}}
10-
Dapr Workflow is currently in beta. [See known limitations for {{% dapr-latest-version cli="true" %}}]({{< ref "workflow-overview.md#limitations" >}}).
11-
{{% /alert %}}
12-
13-
149
Let’s create a Dapr workflow and invoke it using the console. With the [provided workflow example](https://github.com/dapr/java-sdk/tree/master/examples/src/main/java/io/dapr/examples/workflows), you will:
1510

1611
- Execute the workflow instance using the [Java workflow worker](https://github.com/dapr/java-sdk/blob/master/examples/src/main/java/io/dapr/examples/workflows/DemoWorkflowWorker.java)

‎docs/dapr-sdk-workflows/index-all.html‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -138,40 +138,40 @@ <h2 class="title" id="I:C">C</h2>
138138
that completes when the activity completes.If the activity completes successfully, the returned <code>Task</code>'s
139139
value will be the activity's output.</div>
140140
</dd>
141-
<dt><a href="io/dapr/workflows/WorkflowContext.html#callSubWorkflow(java.lang.String)" class="member-name-link">callSubWorkflow(String)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
141+
<dt><a href="io/dapr/workflows/WorkflowContext.html#callChildWorkflow(java.lang.String)" class="member-name-link">callChildWorkflow(String)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
142142
<dd>
143-
<div class="block">Asynchronously invokes another workflow as a sub-workflow and returns a <code>Task</code> that completes
144-
when the sub-workflow completes.</div>
143+
<div class="block">Asynchronously invokes another workflow as a child-workflow and returns a <code>Task</code> that completes
144+
when the child-workflow completes.</div>
145145
</dd>
146-
<dt><a href="io/dapr/workflows/WorkflowContext.html#callSubWorkflow(java.lang.String,java.lang.Object)" class="member-name-link">callSubWorkflow(String, Object)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
146+
<dt><a href="io/dapr/workflows/WorkflowContext.html#callChildWorkflow(java.lang.String,java.lang.Object)" class="member-name-link">callChildWorkflow(String, Object)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
147147
<dd>
148-
<div class="block">Asynchronously invokes another workflow as a sub-workflow and returns a <code>Task</code> that completes
149-
when the sub-workflow completes.</div>
148+
<div class="block">Asynchronously invokes another workflow as a child-workflow and returns a <code>Task</code> that completes
149+
when the child-workflow completes.</div>
150150
</dd>
151-
<dt><a href="io/dapr/workflows/WorkflowContext.html#callSubWorkflow(java.lang.String,java.lang.Object,java.lang.Class)" class="member-name-link">callSubWorkflow(String, Object, Class&lt;V&gt;)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
151+
<dt><a href="io/dapr/workflows/WorkflowContext.html#callChildWorkflow(java.lang.String,java.lang.Object,java.lang.Class)" class="member-name-link">callChildWorkflow(String, Object, Class&lt;V&gt;)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
152152
<dd>
153-
<div class="block">Asynchronously invokes another workflow as a sub-workflow and returns a <code>Task</code> that completes
154-
when the sub-workflow completes.</div>
153+
<div class="block">Asynchronously invokes another workflow as a child-workflow and returns a <code>Task</code> that completes
154+
when the child-workflow completes.</div>
155155
</dd>
156-
<dt><a href="io/dapr/workflows/WorkflowContext.html#callSubWorkflow(java.lang.String,java.lang.Object,java.lang.String,com.microsoft.durabletask.TaskOptions)" class="member-name-link">callSubWorkflow(String, Object, String, TaskOptions)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
156+
<dt><a href="io/dapr/workflows/WorkflowContext.html#callChildWorkflow(java.lang.String,java.lang.Object,java.lang.String,com.microsoft.durabletask.TaskOptions)" class="member-name-link">callChildWorkflow(String, Object, String, TaskOptions)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
157157
<dd>
158-
<div class="block">Asynchronously invokes another workflow as a sub-workflow and returns a <code>Task</code> that completes
159-
when the sub-workflow completes.</div>
158+
<div class="block">Asynchronously invokes another workflow as a child-workflow and returns a <code>Task</code> that completes
159+
when the child-workflow completes.</div>
160160
</dd>
161-
<dt><a href="io/dapr/workflows/DaprWorkflowContextImpl.html#callSubWorkflow(java.lang.String,java.lang.Object,java.lang.String,com.microsoft.durabletask.TaskOptions,java.lang.Class)" class="member-name-link">callSubWorkflow(String, Object, String, TaskOptions, Class&lt;V&gt;)</a> - Method in class io.dapr.workflows.<a href="io/dapr/workflows/DaprWorkflowContextImpl.html" title="class in io.dapr.workflows">DaprWorkflowContextImpl</a></dt>
161+
<dt><a href="io/dapr/workflows/DaprWorkflowContextImpl.html#callChildWorkflow(java.lang.String,java.lang.Object,java.lang.String,com.microsoft.durabletask.TaskOptions,java.lang.Class)" class="member-name-link">callChildWorkflow(String, Object, String, TaskOptions, Class&lt;V&gt;)</a> - Method in class io.dapr.workflows.<a href="io/dapr/workflows/DaprWorkflowContextImpl.html" title="class in io.dapr.workflows">DaprWorkflowContextImpl</a></dt>
162162
<dd>
163-
<div class="block">Asynchronously invokes another workflow as a sub-workflow and returns a <code>Task</code> that completes
164-
when the sub-workflow completes.</div>
163+
<div class="block">Asynchronously invokes another workflow as a child-workflow and returns a <code>Task</code> that completes
164+
when the child-workflow completes.</div>
165165
</dd>
166-
<dt><a href="io/dapr/workflows/WorkflowContext.html#callSubWorkflow(java.lang.String,java.lang.Object,java.lang.String,com.microsoft.durabletask.TaskOptions,java.lang.Class)" class="member-name-link">callSubWorkflow(String, Object, String, TaskOptions, Class&lt;V&gt;)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
166+
<dt><a href="io/dapr/workflows/WorkflowContext.html#callChildWorkflow(java.lang.String,java.lang.Object,java.lang.String,com.microsoft.durabletask.TaskOptions,java.lang.Class)" class="member-name-link">callChildWorkflow(String, Object, String, TaskOptions, Class&lt;V&gt;)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
167167
<dd>
168-
<div class="block">Asynchronously invokes another workflow as a sub-workflow and returns a <code>Task</code> that completes
169-
when the sub-workflow completes.</div>
168+
<div class="block">Asynchronously invokes another workflow as a child-workflow and returns a <code>Task</code> that completes
169+
when the child-workflow completes.</div>
170170
</dd>
171-
<dt><a href="io/dapr/workflows/WorkflowContext.html#callSubWorkflow(java.lang.String,java.lang.Object,java.lang.String,java.lang.Class)" class="member-name-link">callSubWorkflow(String, Object, String, Class&lt;V&gt;)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
171+
<dt><a href="io/dapr/workflows/WorkflowContext.html#callChildWorkflow(java.lang.String,java.lang.Object,java.lang.String,java.lang.Class)" class="member-name-link">callChildWorkflow(String, Object, String, Class&lt;V&gt;)</a> - Method in interface io.dapr.workflows.<a href="io/dapr/workflows/WorkflowContext.html" title="interface in io.dapr.workflows">WorkflowContext</a></dt>
172172
<dd>
173-
<div class="block">Asynchronously invokes another workflow as a sub-workflow and returns a <code>Task</code> that completes
174-
when the sub-workflow completes.</div>
173+
<div class="block">Asynchronously invokes another workflow as a child-workflow and returns a <code>Task</code> that completes
174+
when the child-workflow completes.</div>
175175
</dd>
176176
<dt><a href="io/dapr/workflows/runtime/WorkflowRuntimeStatus.html#CANCELED" class="member-name-link">CANCELED</a> - Enum constant in enum class io.dapr.workflows.runtime.<a href="io/dapr/workflows/runtime/WorkflowRuntimeStatus.html" title="enum class in io.dapr.workflows.runtime">WorkflowRuntimeStatus</a></dt>
177177
<dd>

0 commit comments

Comments
 (0)