Skip to content

Dependency Update #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 6, 2021
Merged

Dependency Update #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bd9d6a4
Update service client dependencies
Mar 16, 2021
acc66e4
Update temporal-sdk dependencies
Mar 16, 2021
7a4069c
Missed micrometer-core update
Mar 17, 2021
af82446
Merge remote-tracking branch 'upstream/master'
Mar 17, 2021
9a3b0ab
Updated Dependencies
Mar 24, 2021
201bedf
This tests now takes longer to run. I think updates affected the shut…
Mar 24, 2021
c5ac6df
Merge branch 'master' into dependency-update
vkoby Mar 24, 2021
e32d68c
Merge remote-tracking branch 'upstream/master' into dependency-update
Mar 29, 2021
6f92e57
Updated Dependencies
Mar 29, 2021
7a8c52f
Merge remote-tracking branch 'upstream/master' into dependency-update
Apr 5, 2021
8ae3109
Updated dependencies.
Apr 5, 2021
86f6a27
Merge branch 'master' into dependency-update
vkoby Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions temporal-sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ java {

dependencies {
errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
errorprone('com.google.errorprone:error_prone_core:2.5.1')
errorprone('com.google.errorprone:error_prone_core:2.6.0')

api project(':temporal-serviceclient')
api group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
api group: 'io.micrometer', name: 'micrometer-core', version: '1.6.5'

implementation group: 'com.google.guava', name: 'guava', version: '30.1.1-jre'
implementation group: 'com.cronutils', name: 'cron-utils', version: '9.1.3'
implementation group: 'com.cronutils', name: 'cron-utils', version: '9.1.5'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.2'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.12.2'
if (!JavaVersion.current().isJava8()) {
Expand Down
4 changes: 2 additions & 2 deletions temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowStubImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package io.temporal.internal.sync;

import com.google.common.base.Strings;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.temporal.api.common.v1.WorkflowExecution;
Expand Down Expand Up @@ -49,7 +50,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.lang3.StringUtils;

class WorkflowStubImpl implements WorkflowStub {
private final WorkflowClientOptions clientOptions;
Expand Down Expand Up @@ -389,7 +389,7 @@ private void checkExecutionIsNotStarted() {
*/
private WorkflowExecution currentExecutionWithoutRunId() {
WorkflowExecution workflowExecution = execution.get();
if (StringUtils.isEmpty(workflowExecution.getRunId())) {
if (Strings.isNullOrEmpty(workflowExecution.getRunId())) {
return workflowExecution;
} else {
return WorkflowExecution.newBuilder(workflowExecution).setRunId("").build();
Expand Down
6 changes: 3 additions & 3 deletions temporal-serviceclient/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ java {

dependencies {
errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
errorprone('com.google.errorprone:error_prone_core:2.5.1')
errorprone('com.google.errorprone:error_prone_core:2.6.0')

api 'io.grpc:grpc-protobuf:1.36.1'
api 'io.grpc:grpc-stub:1.36.1'
api 'io.grpc:grpc-core:1.36.1'
api 'io.grpc:grpc-netty-shaded:1.36.1'
api group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.15.6'
api group: 'com.google.protobuf', name: 'protobuf-java-util', version: '3.15.7'
api group: 'com.uber.m3', name: 'tally-core', version: '0.6.1'
api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
if (!JavaVersion.current().isJava8()) {
Expand Down Expand Up @@ -122,7 +122,7 @@ jar {

protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.15.6'
artifact = 'com.google.protobuf:protoc:3.15.7'
}
plugins {
grpc {
Expand Down
2 changes: 1 addition & 1 deletion temporal-testing-junit4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ java {

dependencies {
errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
errorprone('com.google.errorprone:error_prone_core:2.5.1')
errorprone('com.google.errorprone:error_prone_core:2.6.0')

api project(':temporal-testing')

Expand Down
2 changes: 1 addition & 1 deletion temporal-testing-junit5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ java {

dependencies {
errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
errorprone('com.google.errorprone:error_prone_core:2.5.1')
errorprone('com.google.errorprone:error_prone_core:2.6.0')

api project(':temporal-testing')

Expand Down
4 changes: 2 additions & 2 deletions temporal-testing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ java {

dependencies {
errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
errorprone('com.google.errorprone:error_prone_core:2.5.1')
errorprone('com.google.errorprone:error_prone_core:2.6.0')

api project(':temporal-sdk')

implementation group: 'com.google.guava', name: 'guava', version: '30.1.1-jre'
implementation group: 'com.cronutils', name: 'cron-utils', version: '9.1.3'
implementation group: 'com.cronutils', name: 'cron-utils', version: '9.1.5'
}

license {
Expand Down