From 79c8d11d7a4d3559b2cd0d2cf7019c42770b7de0 Mon Sep 17 00:00:00 2001
From: Artur Souza <artursouza.ms@outlook.com>
Date: Fri, 10 Sep 2021 15:21:16 -0700
Subject: [PATCH 1/2] Update dapr and proto version to 1.4 RCs.

---
 .github/workflows/build.yml    | 6 +++---
 .github/workflows/validate.yml | 6 +++---
 pom.xml                        | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d031ecdfc6..611a85b23c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,9 +25,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.3.0-rc.1
-      DAPR_RUNTIME_VER: 1.3.0-rc.1
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.3.0-rc.1/install/install.sh
+      DAPR_CLI_VER: 1.4.0-rc.1
+      DAPR_RUNTIME_VER: 1.4.0-rc.6
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.4.0-rc.1/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
       OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 0d7fa98407..d66312159c 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -30,9 +30,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.3.0-rc.1
-      DAPR_RUNTIME_VER: 1.3.0-rc.1
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh
+      DAPR_CLI_VER: 1.4.0-rc.1
+      DAPR_RUNTIME_VER: 1.4.0-rc.6
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.4.0-rc.1/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
     steps:
diff --git a/pom.xml b/pom.xml
index ab1afdea76..3d246046b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.39.0</grpc.version>
     <protobuf.version>3.13.0</protobuf.version>
-    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.3.0-rc.1/dapr/proto</dapr.proto.baseurl>
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.4.0-rc.6/dapr/proto</dapr.proto.baseurl>
     <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>

From 20ff7ac4f4f331a90e99f1770aa2dd21ce97962f Mon Sep 17 00:00:00 2001
From: Artur Souza <artursouza.ms@outlook.com>
Date: Fri, 10 Sep 2021 15:31:44 -0700
Subject: [PATCH 2/2] Fix publish to only run with JDK 11.

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 611a85b23c..bed9277096 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -130,7 +130,7 @@ jobs:
       run: |
         echo "DEPLOY_OSSRH=true" >> $GITHUB_ENV
     - name: Publish to ossrh
-      if: env.DEPLOY_OSSRH == 'true'
+      if: env.DEPLOY_OSSRH == 'true' && env.JDK_VER == '11'
       run: |
         echo ${{ secrets.GPG_PRIVATE_KEY }} | base64 -d > private-key.gpg
         export GPG_TTY=$(tty)