Skip to content
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

Jump to bottom

Excavator: Upgrades gradle wrapper to the latest version #248

Merged
merged 5 commits into from
Sep 11, 2019
Merged

Excavator: Upgrades gradle wrapper to the latest version #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de864db
Excavator: Upgrades gradle wrapper to the latest version
svc-excavator-bot Sep 4, 2019
53ddff1
Reduce warnings
iamdanfox Sep 4, 2019
4c3b0a4
new publish-jar.gradle
iamdanfox Sep 10, 2019
b9ed763
Merge remote-tracking branch 'origin/develop' into roomba/latest-grad…
iamdanfox Sep 10, 2019
7237037
Revert
iamdanfox Sep 10, 2019
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
5 changes: 5 additions & 0 deletions gradle/publish-jar.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,8 @@ publishing {
}
}
}

// Turning off module metadata so that all consumers just use regular POMs
tasks.withType(GenerateModuleMetadata) {
enabled = false
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.0-20190828220044+0000-bin.zip
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.0-20190904072820+0000-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 4 additions & 4 deletions tracing-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apply from: "$rootDir/gradle/publish-jar.gradle"

dependencies {
testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
testCompile "org.mockito:mockito-core"
testCompile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
testImplementation "junit:junit"
testImplementation "org.assertj:assertj-core"
testImplementation "org.mockito:mockito-core"
testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"

annotationProcessor "org.immutables:value"
compileOnly "org.immutables:value::annotations"
Expand Down
10 changes: 5 additions & 5 deletions tracing-jaxrs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ dependencies {
compile project(":tracing")
compile "javax.ws.rs:javax.ws.rs-api"

testCompile "ch.qos.logback:logback-classic"
testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
testCompile "org.jmock:jmock"
testCompile "org.mockito:mockito-core"
testImplementation "ch.qos.logback:logback-classic"
testImplementation "junit:junit"
testImplementation "org.assertj:assertj-core"
testImplementation "org.jmock:jmock"
testImplementation "org.mockito:mockito-core"

annotationProcessor "org.immutables:value"
compileOnly "org.immutables:value::annotations"
Expand Down
8 changes: 4 additions & 4 deletions tracing-jersey/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ dependencies {
implementation 'javax.ws.rs:javax.ws.rs-api'
implementation project(':tracing-api')

testCompile "io.dropwizard:dropwizard-testing"
testCompile "junit:junit"
testCompile "org.hamcrest:hamcrest-all"
testCompile "org.mockito:mockito-core"
testImplementation "io.dropwizard:dropwizard-testing"
testImplementation "junit:junit"
testImplementation "org.hamcrest:hamcrest-all"
testImplementation "org.mockito:mockito-core"

compileOnly "org.immutables:value::annotations"
testCompileOnly "org.immutables:value::annotations"
Expand Down
6 changes: 3 additions & 3 deletions tracing-okhttp3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ dependencies {

implementation project(':tracing-api')

testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
testCompile "org.mockito:mockito-core"
testImplementation "junit:junit"
testImplementation "org.assertj:assertj-core"
testImplementation "org.mockito:mockito-core"

compileOnly "org.immutables:value::annotations"
testCompileOnly "org.immutables:value::annotations"
Expand Down
14 changes: 7 additions & 7 deletions tracing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ dependencies {
implementation 'com.google.code.findbugs:jsr305'
implementation 'com.google.errorprone:error_prone_annotations'

testCompile "ch.qos.logback:logback-classic"
testCompile "com.palantir.safe-logging:preconditions-assertj"
testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
testCompile "org.jmock:jmock"
testCompile "org.mockito:mockito-core"
testCompile "io.zipkin.java:zipkin"
testImplementation "ch.qos.logback:logback-classic"
testImplementation "com.palantir.safe-logging:preconditions-assertj"
testImplementation "junit:junit"
testImplementation "org.assertj:assertj-core"
testImplementation "org.jmock:jmock"
testImplementation "org.mockito:mockito-core"
testImplementation "io.zipkin.java:zipkin"

annotationProcessor "org.immutables:value"
compileOnly "org.immutables:value::annotations"
Expand Down