Merge branch 'master' into test-long-vals

dapr · Mar 31, 2022 · e35738c · e35738c
2 parents 7fe8c65 + bfe7f38
commit e35738c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git 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.6.0-rc.1
-      DAPR_RUNTIME_VER: 1.6.0-rc.2
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.6.0-rc.1/install/install.sh
+      DAPR_CLI_VER: 1.7.0-rc.2
+      DAPR_RUNTIME_VER: 1.7.0-rc.2
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.7.0-rc.2/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF: 4cf499448ef6ee87c83db6a11b84e83237e92665
     steps:

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -36,9 +36,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.6.0-rc.1
-      DAPR_RUNTIME_VER: 1.6.0-rc.2
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.6.0-rc.1/install/install.sh
+      DAPR_CLI_VER: 1.7.0-rc.2
+      DAPR_RUNTIME_VER: 1.7.0-rc.2
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.7.0-rc.2/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF: 4cf499448ef6ee87c83db6a11b84e83237e92665
     steps:

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.42.1</grpc.version>
     <protobuf.version>3.17.3</protobuf.version>
-    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/5a307f3deaa1b322f7945179adad0403de80eb7e/dapr/proto</dapr.proto.baseurl>
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.7.0-rc.2/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>

diff --git a/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java b/sdk-tests/src/test/java/io/dapr/it/pubsub/http/PubSubIT.java
@@ -50,6 +50,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+
 
 @RunWith(Parameterized.class)
 public class PubSubIT extends BaseIT {
@@ -500,6 +502,7 @@ public Long getValue() {
       return value;
     }
 
+
     @Override
     public boolean equals(Object o) {
       if (this == o) return true;

diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.11.3</version>
+      <version>2.12.6.1</version>
     </dependency>
     <dependency>
       <groupId>io.projectreactor</groupId>