Merge branch 'master' into workflows-1164

Author: salaboy

.github/scripts/create-release.sh

@@ -42,12 +42,12 @@ if [ "$VARIANT" = "SNAPSHOT" ]; then
   git checkout -b $branch_name
   ${script_dir}/update_sdk_version.sh $REL_VERSION
   git clean -xdf
-  git commit -s -m "Update master version to ${$REL_VERSION}" -a
+  git commit -s -m "Update master version to ${REL_VERSION}" -a
   git push origin $branch_name
   gh pr create --repo ${GITHUB_REPOSITORY} \
     --base master \
-    --title "Update master version to ${$REL_VERSION}" \
-    --body "Update master version to ${$REL_VERSION}"
+    --title "Update master version to ${REL_VERSION}" \
+    --body "Update master version to ${REL_VERSION}"
   echo "Done."
   exit 0
 elif [ "$VARIANT" = "rc" ]; then
@@ -84,26 +84,26 @@ fi
 echo "$RELEASE_BRANCH branch is ready."
 
 if [ `git rev-parse --verify $RELEASE_TAG 2>/dev/null` ]; then
-  echo "$RELEASE_TAG tag already exists, aborting ..."
-  exit 2
-fi
-
-${script_dir}/update_sdk_version.sh $REL_VERSION
-git commit -s -m "Release $REL_VERSION" -a
-if [ "$VARIANT" = "" ]; then
-  echo "Generating docs ..."
-  ${script_dir}/update_docs.sh $REL_VERSION
-  git commit -s -m "Generate updated javadocs for $REL_VERSION" -a
-fi
-git push origin $RELEASE_BRANCH
+  echo "$RELEASE_TAG tag already exists, checking it out ..."
+  git checkout $RELEASE_TAG
+else
+  ${script_dir}/update_sdk_version.sh $REL_VERSION
+  git commit -s -m "Release $REL_VERSION" -a
+  if [ "$VARIANT" = "" ]; then
+    echo "Generating docs ..."
+    ${script_dir}/update_docs.sh $REL_VERSION
+    git commit -s -m "Generate updated javadocs for $REL_VERSION" -a
+  fi
+  git push origin $RELEASE_BRANCH
 
-echo "Tagging $RELEASE_TAG ..."
-git tag $RELEASE_TAG
-echo "$RELEASE_TAG is tagged."
+  echo "Tagging $RELEASE_TAG ..."
+  git tag $RELEASE_TAG
+  echo "$RELEASE_TAG is tagged."
 
-echo "Pushing $RELEASE_TAG tag ..."
-git push origin $RELEASE_TAG
-echo "$RELEASE_TAG tag is pushed."
+  echo "Pushing $RELEASE_TAG tag ..."
+  git push origin $RELEASE_TAG
+  echo "$RELEASE_TAG tag is pushed."
+fi
 
 if [ "$VARIANT" = "" ]; then
   git clean -xdf
@@ -114,8 +114,8 @@ if [ "$VARIANT" = "" ]; then
   git push origin $branch_name
   gh pr create --repo ${GITHUB_REPOSITORY} \
     --base master \
-    --title "Update master docs for ${$REL_VERSION} release" \
-    --body "Update master docs for ${$REL_VERSION} release"
+    --title "Update master docs for ${REL_VERSION} release" \
+    --body "Update master docs for ${REL_VERSION} release"
 fi
 
 echo "Done."

.github/scripts/update_docs.sh

@@ -27,5 +27,5 @@ rm -f daprdocs/content/en/java-sdk-docs/_index.mdbak || echo
 rm -f daprdocs/content/en/java-sdk-docs/spring-boot/_index.md/_index.mdbak || echo
 
 rm -rf docs
-./mvnw -Dmaven.test.skip=false -Djacoco.skip=true clean install
-./mvnw site-deploy
+./mvnw -Dmaven.test.skip=true -Djacoco.skip=true clean install
+./mvnw -Dmaven.test.skip=true -Djacoco.skip=true site-deploy

.github/workflows/create-release.yml

@@ -25,11 +25,18 @@ jobs:
   create-release:
     name: Creates release branch and tag
     runs-on: ubuntu-latest
+    env:
+      JDK_VER: '17'
     steps:
       - name: Check out code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up OpenJDK ${{ env.JDK_VER }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: ${{ env.JDK_VER }}
       - name: Install required packages
         run: |
           sudo apt-get update

README.md

@@ -49,19 +49,19 @@ For a Maven project, add the following to your `pom.xml` file:
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk</artifactId>
-      <version>1.12.0</version>
+      <version>1.13.1</version>
     </dependency>
     <!-- Dapr's SDK for Actors (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-actors</artifactId>
-      <version>1.12.0</version>
+      <version>1.13.1</version>
     </dependency>
     <!-- Dapr's SDK integration with SpringBoot (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-springboot</artifactId>
-      <version>1.12.0</version>
+      <version>1.13.1</version>
     </dependency>
     ...
   </dependencies>
@@ -75,11 +75,11 @@ For a Gradle project, add the following to your `build.gradle` file:
 dependencies {
 ...
     // Dapr's core SDK with all features, except Actors.
-    compile('io.dapr:dapr-sdk:1.12.0')
+    compile('io.dapr:dapr-sdk:1.13.1')
     // Dapr's SDK for Actors (optional).
-    compile('io.dapr:dapr-sdk-actors:1.12.0')
+    compile('io.dapr:dapr-sdk-actors:1.13.1')
     // Dapr's SDK integration with SpringBoot (optional).
-    compile('io.dapr:dapr-sdk-springboot:1.12.0')
+    compile('io.dapr:dapr-sdk-springboot:1.13.1')
 }
 ```
 

dapr-spring/dapr-spring-boot-autoconfigure/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-spring-boot-autoconfigure</artifactId>

dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.dapr.spring</groupId>
         <artifactId>dapr-spring-parent</artifactId>
-        <version>0.13.0-SNAPSHOT</version>
+        <version>0.14.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

dapr-spring/dapr-spring-boot-tests/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-spring-boot-tests</artifactId>

dapr-spring/dapr-spring-data/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-spring-data</artifactId>

dapr-spring/dapr-spring-messaging/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <version>0.14.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-spring-messaging</artifactId>