diff --git a/build.gradle b/build.gradle index 9694515342..69c1562c21 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,12 @@ plugins { id 'de.marcphilipp.nexus-publish' version '0.4.0' apply false } +ext { + logbackVersion = '1.2.6' +} + apply from: "$rootDir/gradle/versioning.gradle" apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/licensing.gradle" apply from: "$rootDir/gradle/publishing.gradle" -apply from: "$rootDir/gradle/dependencyManagement.gradle" +apply from: "$rootDir/gradle/dependencyManagement.gradle" \ No newline at end of file diff --git a/temporal-kotlin/build.gradle b/temporal-kotlin/build.gradle index c8f79c26da..4ccd916edd 100644 --- a/temporal-kotlin/build.gradle +++ b/temporal-kotlin/build.gradle @@ -1,9 +1,9 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.3.72' -// id 'org.jetbrains.kotlin.jvm' version '1.4.21' +// id 'org.jetbrains.kotlin.jvm' version '1.3.72' + id 'org.jetbrains.kotlin.jvm' version '1.4.21' // id 'org.jetbrains.kotlin.jvm' version '1.5.30' - id 'org.jlleitschuh.gradle.ktlint' version '10.1.0' + id 'org.jlleitschuh.gradle.ktlint' version '10.2.0' } description = '''Temporal Workflow Java SDK Kotlin''' @@ -29,6 +29,6 @@ dependencies { testImplementation project(':temporal-testing') testImplementation project(':temporal-testing-junit4') - testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.5' + testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: "${logbackVersion}" testImplementation group: 'junit', name: 'junit', version: '4.13.2' } \ No newline at end of file diff --git a/temporal-opentracing/build.gradle b/temporal-opentracing/build.gradle index 030d5f5b43..83733131df 100644 --- a/temporal-opentracing/build.gradle +++ b/temporal-opentracing/build.gradle @@ -14,7 +14,7 @@ dependencies { testImplementation project(":temporal-testing") testImplementation project(':temporal-testing-junit4') testImplementation group: 'junit', name: 'junit', version: '4.13.2' - testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.5' + testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: "${logbackVersion}" testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4' testImplementation group: 'io.opentracing', name: 'opentracing-mock', version: "$opentracingVersion" testImplementation group: 'io.jaegertracing', name: 'jaeger-client', version: '1.6.0' diff --git a/temporal-sdk/build.gradle b/temporal-sdk/build.gradle index 341fe73d23..8f9b55f31a 100644 --- a/temporal-sdk/build.gradle +++ b/temporal-sdk/build.gradle @@ -13,7 +13,7 @@ dependencies { implementation 'javax.annotation:javax.annotation-api:1.3.2' } testImplementation project(':temporal-testing-junit4') - testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.5' + testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: "${logbackVersion}" testImplementation group: 'junit', name: 'junit', version: '4.13.2' testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4' } diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/LongRunningWorkflowTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/LongRunningWorkflowTest.java index 3b30adcd27..d15d72fedf 100644 --- a/temporal-sdk/src/test/java/io/temporal/workflow/LongRunningWorkflowTest.java +++ b/temporal-sdk/src/test/java/io/temporal/workflow/LongRunningWorkflowTest.java @@ -40,7 +40,9 @@ public class LongRunningWorkflowTest { .setWorkflowTypes(LongRunningWorkflowImpl.class) .setActivityImplementations(sleepActivities) .setTestTimeoutSeconds( - WorkflowServiceStubsOptions.DEFAULT_POLL_RPC_TIMEOUT.plus(Duration.ofSeconds(20)).toMillis()) + WorkflowServiceStubsOptions.DEFAULT_POLL_RPC_TIMEOUT + .plus(Duration.ofSeconds(20)) + .toMillis()) .build(); /** diff --git a/temporal-serviceclient/build.gradle b/temporal-serviceclient/build.gradle index 326809b103..b5dabeb5f4 100644 --- a/temporal-serviceclient/build.gradle +++ b/temporal-serviceclient/build.gradle @@ -18,7 +18,7 @@ dependencies { if (!JavaVersion.current().isJava8()) { implementation 'javax.annotation:javax.annotation-api:1.3.2' } - testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.5' + testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: "${logbackVersion}" testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4' testImplementation group: 'junit', name: 'junit', version: '4.13.2' } diff --git a/temporal-testing-junit4/src/main/java/io/temporal/testing/internal/ActiveOnEnvVariableRule.java b/temporal-testing-junit4/src/main/java/io/temporal/testing/internal/ActiveOnEnvVariableRule.java deleted file mode 100644 index e4b03c2017..0000000000 --- a/temporal-testing-junit4/src/main/java/io/temporal/testing/internal/ActiveOnEnvVariableRule.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2020 Temporal Technologies, Inc. All Rights Reserved. - * - * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Modifications copyright (C) 2017 Uber Technologies, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"). You may not - * use this file except in compliance with the License. A copy of the License is - * located at - * - * http://aws.amazon.com/apache2.0 - * - * or in the "license" file accompanying this file. This file is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package io.temporal.testing.internal; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -public class ActiveOnEnvVariableRule implements TestRule { - - @Override - public Statement apply(Statement base, Description description) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - - base.evaluate(); - } - }; - } -} diff --git a/temporal-testing-junit5/build.gradle b/temporal-testing-junit5/build.gradle index 3239002718..7b304b38fb 100644 --- a/temporal-testing-junit5/build.gradle +++ b/temporal-testing-junit5/build.gradle @@ -3,10 +3,10 @@ description = '''Temporal Workflow Java SDK testing, JUnit 5.x integration''' dependencies { api project(':temporal-testing') - api platform('org.junit:junit-bom:5.7.2') + api platform('org.junit:junit-bom:5.8.0') api group: 'org.junit.jupiter', name: 'junit-jupiter-api' - testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.5' + testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: "${logbackVersion}" testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter' } diff --git a/temporal-testing/build.gradle b/temporal-testing/build.gradle index a28dc421bc..24bad3fb8e 100644 --- a/temporal-testing/build.gradle +++ b/temporal-testing/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation group: 'com.cronutils', name: 'cron-utils', version: '9.1.5' testImplementation group: 'junit', name: 'junit', version: '4.13.2' - testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.5' + testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: "${logbackVersion}" testRuntimeOnly group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.32' }