Upgrade to use Temporal SDK v1.7.0 (temporalio#209)

Dmitry Spikhalskiy · web-flow · commit 17d536e1d5b3 · 2022-01-11T17:08:12.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,11 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'io.temporal', name: 'temporal-sdk', version: '1.6.0'
+    implementation(platform("com.fasterxml.jackson:jackson-bom:2.13.1"))
+
+    implementation group: 'io.temporal', name: 'temporal-sdk', version: '1.7.0'
+
+    implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.10'
     implementation group: 'commons-configuration', name: 'commons-configuration', version: '1.10'
     implementation group: 'io.cloudevents', name: 'cloudevents-core', version: '2.3.0'
@@ -42,7 +46,7 @@ dependencies {
     implementation group: 'net.thisptr', name: 'jackson-jq', version: '1.0.0-preview.20210928'
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.5'
 
-    testImplementation("io.temporal:temporal-testing:1.6.0")
+    testImplementation("io.temporal:temporal-testing:1.7.0")
     testImplementation ("io.temporal:temporal-testing") {
         capabilities {
             requireCapability("io.temporal:temporal-testing-junit4")
@@ -65,14 +69,6 @@ dependencies {
     errorprone("com.google.errorprone:error_prone_core:2.10.0")
 }
 
-configurations.all {
-    resolutionStrategy {
-        force 'com.fasterxml.jackson.core:jackson-core:2.12.5'
-        force 'com.fasterxml.jackson.core:jackson-databind:2.12.5'
-        force 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.5'
-    }
-}
-
 compileJava {
     dependsOn 'googleJavaFormat'
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name = 'temporal-samples'
+rootProject.name = 'temporal-java-samples'
 
diff --git a/src/test/java/io/temporal/samples/hello/HelloCancellationScopeTest.java b/src/test/java/io/temporal/samples/hello/HelloCancellationScopeTest.java
@@ -37,10 +37,9 @@ public class HelloCancellationScopeTest {
       TestWorkflowRule.newBuilder()
           .setWorkflowTypes(GreetingWorkflowImpl.class)
           .setActivityImplementations(new GreetingActivitiesImpl())
-          .setTestTimeoutSeconds(200)
           .build();
 
-  @Test
+  @Test(timeout = 200_000)
   public void testActivityImpl() {
     // Get a workflow stub using the same task queue the worker uses.
     GreetingWorkflow workflow =

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-rootProject.name = 'temporal-samples'`
	`1`	`+rootProject.name = 'temporal-java-samples'`
`2`	`2`