Skip to content

Post-release cleanup and versions upgrade #715

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 1 commit into from
Sep 13, 2021
Merged

Post-release cleanup and versions upgrade #715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 4 additions & 4 deletions temporal-kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'''
Expand All @@ -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'
}
2 changes: 1 addition & 1 deletion temporal-opentracing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion temporal-sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
4 changes: 3 additions & 1 deletion temporal-sdk/src/test/java/io/temporal/workflow/LongRunningWorkflowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

/**
Expand Down
2 changes: 1 addition & 1 deletion temporal-serviceclient/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
38 changes: 0 additions & 38 deletions ...al-testing-junit4/src/main/java/io/temporal/testing/internal/ActiveOnEnvVariableRule.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions temporal-testing-junit5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion temporal-testing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down