Merge branch 'master' into docs/add-architecture-diagram

Author: artur-ciocanu

.github/workflows/build.yml

@@ -113,10 +113,17 @@ jobs:
         make
         sudo cp dist/linux_amd64/release/dapr /usr/local/bin/dapr
         cd ..
-    - name: Initialize Dapr runtime ${{ env.DAPR_RUNTIME_VER }}
+    - name: Uninstall Dapr runtime ${{ env.DAPR_RUNTIME_VER }}
+      run: dapr uninstall --all
+    - name: Ensure Dapr runtime uninstalled
       run: |
-        dapr uninstall --all
-        dapr init --runtime-version ${{ env.DAPR_RUNTIME_VER }}
+        while [ "$(docker ps -aq --filter 'name=^/dapr')" ]; do
+          echo "Waiting for Dapr containers to be deleted..."
+          sleep 5
+        done
+        echo "All dapr containers are deleted."
+    - name: Initialize Dapr runtime ${{ env.DAPR_RUNTIME_VER }}
+      run: dapr init --runtime-version ${{ env.DAPR_RUNTIME_VER }}
     - name: Build and override daprd with referenced commit.
       if: env.DAPR_REF != ''
       run: |

.github/workflows/validate.yml

@@ -82,10 +82,17 @@ jobs:
           make
           sudo cp dist/linux_amd64/release/dapr /usr/local/bin/dapr
           cd ..
+      - name: Uninstall Dapr runtime ${{ env.DAPR_RUNTIME_VER }}
+        run: dapr uninstall --all
+      - name: Ensure Dapr runtime uninstalled
+        run: |
+          while [ "$(docker ps -aq --filter 'name=^/dapr')" ]; do
+            echo "Waiting for Dapr containers to be deleted..."
+            sleep 5
+          done
+          echo "All dapr containers are deleted."
       - name: Initialize Dapr runtime ${{ env.DAPR_RUNTIME_VER }}
-        run: |
-          dapr uninstall --all
-          dapr init --runtime-version ${{ env.DAPR_RUNTIME_VER }}
+        run: dapr init --runtime-version ${{ env.DAPR_RUNTIME_VER }}
       - name: Build and override daprd with referenced commit.
         if: env.DAPR_REF != ''
         run: |

sdk/pom.xml

@@ -134,7 +134,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty-shaded</artifactId>
+      <artifactId>grpc-netty</artifactId>
       <version>${grpc.version}</version>
     </dependency>
   </dependencies>

sdk/src/main/java/io/dapr/utils/NetworkUtils.java

@@ -22,9 +22,9 @@
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.TlsChannelCredentials;
-import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
-import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
-import io.grpc.netty.shaded.io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyChannelBuilder;
+import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 
 import java.io.FileInputStream;
 import java.io.IOException;