From d192ed8bb6c3f407bea2a8dee3d61ff2d1fe56f4 Mon Sep 17 00:00:00 2001
From: Artur Souza <artursouza.ms@outlook.com>
Date: Tue, 3 Oct 2023 14:12:28 -0700
Subject: [PATCH] Next release 1.11.0 snapshot (#934)

* Fix release script to handle workflows sdk.

Signed-off-by: Artur Souza <asouza.pro@gmail.com>

* Upgrade the version to 1.11.0-SNAPSHOT

Signed-off-by: Artur Souza <asouza.pro@gmail.com>

---------

Signed-off-by: Artur Souza <asouza.pro@gmail.com>
---
 examples/pom.xml              |  4 ++--
 pom.xml                       |  4 ++--
 scripts/update_sdk_version.sh | 12 ++++++++----
 sdk-actors/pom.xml            |  4 ++--
 sdk-autogen/pom.xml           |  4 ++--
 sdk-springboot/pom.xml        |  4 ++--
 sdk-tests/pom.xml             |  2 +-
 sdk-workflows/pom.xml         |  4 ++--
 sdk/pom.xml                   |  4 ++--
 9 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 7f0b86d45..ebadafdd6 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>io.dapr</groupId>
     <artifactId>dapr-sdk-parent</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
+    <version>1.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-sdk-examples</artifactId>
   <packaging>jar</packaging>
-  <version>1.10.0-SNAPSHOT</version>
+  <version>1.11.0-SNAPSHOT</version>
   <name>dapr-sdk-examples</name>
 
   <properties>
diff --git a/pom.xml b/pom.xml
index 5c84ee176..41a0c1c68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
   <groupId>io.dapr</groupId>
   <artifactId>dapr-sdk-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.10.0-SNAPSHOT</version>
+  <version>1.11.0-SNAPSHOT</version>
   <name>dapr-sdk-parent</name>
   <description>SDK for Dapr.</description>
   <url>https://dapr.io</url>
@@ -17,7 +17,7 @@
     <grpc.version>1.42.1</grpc.version>
     <protobuf.version>3.17.3</protobuf.version>
     <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.12.0-rc.2/dapr/proto</dapr.proto.baseurl>
-    <dapr.sdk-workflows.version>0.10.0-SNAPSHOT</dapr.sdk-workflows.version>
+    <dapr.sdk-workflows.version>0.11.0-SNAPSHOT</dapr.sdk-workflows.version>
     <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
     <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
diff --git a/scripts/update_sdk_version.sh b/scripts/update_sdk_version.sh
index fce2a5486..f51c33474 100755
--- a/scripts/update_sdk_version.sh
+++ b/scripts/update_sdk_version.sh
@@ -3,11 +3,15 @@
 set -uex
 
 DAPR_JAVA_SDK_VERSION=$1
-# replace the major version of DAPR_JAVA_SDK_VERSION with 0 while in alpha
-DAPR_WORKFLOW_SDK_VERSION=$(echo $DAPR_JAVA_SDK_VERSION | sed -E "s/[0-9]+\.(.*?)/0.\1/")
+
+# The workflows sdk tracks the regular SDK minor and patch versions, just not the major.
+# Replaces the workflows SDK major version to 0 until it is stable.
+DAPR_JAVA_WORKFLOWS_SDK_VERSION=`echo $DAPR_JAVA_SDK_VERSION | sed 's/^[0-9]*\./0./'`
 
 mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION
 mvn versions:set-property -Dproperty=dapr.sdk.version -DnewVersion=$DAPR_JAVA_SDK_VERSION -f sdk-tests/pom.xml
 
-mvn versions:set -DnewVersion=$DAPR_WORKFLOW_SDK_VERSION -f sdk-workflows/pom.xml
-mvn versions:set-property -Dproperty=dapr.sdk-workflows.version -DnewVersion=$DAPR_WORKFLOW_SDK_VERSION
+mvn versions:set -DnewVersion=$DAPR_JAVA_WORKFLOWS_SDK_VERSION -f sdk-workflows/pom.xml
+mvn versions:set-property -Dproperty=dapr.sdk-workflows.version -DnewVersion=$DAPR_JAVA_WORKFLOWS_SDK_VERSION
+
+git clean -f
diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml
index 32c68625c..d4f374c1e 100644
--- a/sdk-actors/pom.xml
+++ b/sdk-actors/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>io.dapr</groupId>
     <artifactId>dapr-sdk-parent</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
+    <version>1.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-sdk-actors</artifactId>
   <packaging>jar</packaging>
-  <version>1.10.0-SNAPSHOT</version>
+  <version>1.11.0-SNAPSHOT</version>
   <name>dapr-sdk-actors</name>
   <description>SDK for Actors on Dapr</description>
 
diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml
index 261714cc2..aba13f36e 100644
--- a/sdk-autogen/pom.xml
+++ b/sdk-autogen/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>io.dapr</groupId>
     <artifactId>dapr-sdk-parent</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
+    <version>1.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-sdk-autogen</artifactId>
   <packaging>jar</packaging>
-  <version>1.10.0-SNAPSHOT</version>
+  <version>1.11.0-SNAPSHOT</version>
   <name>dapr-sdk-autogen</name>
   <description>Auto-generated SDK for Dapr</description>
 
diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml
index cb29a2f18..1631c3573 100644
--- a/sdk-springboot/pom.xml
+++ b/sdk-springboot/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>io.dapr</groupId>
     <artifactId>dapr-sdk-parent</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
+    <version>1.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-sdk-springboot</artifactId>
   <packaging>jar</packaging>
-  <version>1.10.0-SNAPSHOT</version>
+  <version>1.11.0-SNAPSHOT</version>
   <name>dapr-sdk-springboot</name>
   <description>SDK extension for Springboot</description>
 
diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml
index 47df45136..db7ecef28 100644
--- a/sdk-tests/pom.xml
+++ b/sdk-tests/pom.xml
@@ -15,7 +15,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
     <maven.deploy.skip>true</maven.deploy.skip>
-    <dapr.sdk.version>1.10.0-SNAPSHOT</dapr.sdk.version>
+    <dapr.sdk.version>1.11.0-SNAPSHOT</dapr.sdk.version>
     <protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
     <protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
     <grpc.version>1.42.1</grpc.version>
diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml
index 8c6f78a68..d623a79a6 100644
--- a/sdk-workflows/pom.xml
+++ b/sdk-workflows/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>io.dapr</groupId>
     <artifactId>dapr-sdk-parent</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
+    <version>1.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-sdk-workflows</artifactId>
   <packaging>jar</packaging>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>0.11.0-SNAPSHOT</version>
   <name>dapr-sdk-workflows</name>
   <description>SDK for Workflows on Dapr</description>
 
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 66520bcef..dc30a5f59 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>io.dapr</groupId>
     <artifactId>dapr-sdk-parent</artifactId>
-    <version>1.10.0-SNAPSHOT</version>
+    <version>1.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-sdk</artifactId>
   <packaging>jar</packaging>
-  <version>1.10.0-SNAPSHOT</version>
+  <version>1.11.0-SNAPSHOT</version>
   <name>dapr-sdk</name>
   <description>SDK for Dapr</description>