You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by ni...@apache.org on 2017/11/28 22:36:31 UTC
samza git commit: SAMZA-1412 replace mockito-all with mockito-core
Repository: samza
Updated Branches:
refs/heads/master 9961023f7 -> d262f6663
SAMZA-1412 replace mockito-all with mockito-core
ran "./gradlew clean check" and all tests passed
Author: Fred Ji <ha...@gmail.com>
Reviewers: Prateek Maheshwari <pm...@linkedin.com>
Closes #365 from fredji97/mockito-core
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/d262f666
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/d262f666
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/d262f666
Branch: refs/heads/master
Commit: d262f66635c39cb71a570d8438f48cdf304b07a5
Parents: 9961023
Author: Fred Ji <ha...@gmail.com>
Authored: Tue Nov 28 14:36:24 2017 -0800
Committer: Yi Pan (Data Infrastructure) <ni...@gmail.com>
Committed: Tue Nov 28 14:36:24 2017 -0800
----------------------------------------------------------------------
build.gradle | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/d262f666/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index eddb11c..50cc5e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -136,7 +136,7 @@ project(':samza-api') {
compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
testCompile "junit:junit:$junitVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
}
checkstyle {
configFile = new File(rootDir, "checkstyle/checkstyle.xml")
@@ -178,7 +178,7 @@ project(":samza-core_$scalaVersion") {
compile "org.slf4j:slf4j-api:$slf4jVersion"
testCompile project(":samza-api").sourceSets.test.output
testCompile "junit:junit:$junitVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
testCompile "org.powermock:powermock-api-mockito:$powerMockVersion"
testCompile "org.powermock:powermock-core:$powerMockVersion"
testCompile "org.powermock:powermock-module-junit4:$powerMockVersion"
@@ -204,7 +204,7 @@ project(':samza-azure') {
compile project(":samza-core_$scalaVersion")
compile "org.slf4j:slf4j-api:$slf4jVersion"
testCompile "junit:junit:$junitVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
testCompile "org.powermock:powermock-api-mockito:$powerMockVersion"
testCompile "org.powermock:powermock-core:$powerMockVersion"
testCompile "org.powermock:powermock-module-junit4:$powerMockVersion"
@@ -284,7 +284,7 @@ project(":samza-autoscaling_$scalaVersion") {
}
compile "org.apache.httpcomponents:httpclient:$httpClientVersion"
testCompile "junit:junit:$junitVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
}
@@ -304,7 +304,7 @@ project(':samza-elasticsearch') {
compile "com.google.guava:guava:$guavaVersion"
compile "org.slf4j:slf4j-api:$slf4jVersion"
testCompile "junit:junit:$junitVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
testRuntime "org.slf4j:slf4j-simple:$slf4jVersion"
}
@@ -322,7 +322,7 @@ project(':samza-sql') {
testCompile project(":samza-test_$scalaVersion")
testCompile "junit:junit:$junitVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
testRuntime "org.slf4j:slf4j-simple:$slf4jVersion"
}
@@ -359,7 +359,7 @@ project(":samza-kafka_$scalaVersion") {
testCompile "org.apache.kafka:kafka_$scalaVersion:$kafkaVersion:test"
testCompile "org.apache.kafka:kafka-clients:$kafkaVersion:test"
testCompile "junit:junit:$junitVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
testCompile project(":samza-core_$scalaVersion").sourceSets.test.output
@@ -450,7 +450,7 @@ project(":samza-yarn_$scalaVersion") {
compile "joda-time:joda-time:$jodaTimeVersion"
compile "org.apache.zookeeper:zookeeper:$zookeeperVersion"
testCompile "junit:junit:$junitVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
testCompile project(":samza-core_$scalaVersion").sourceSets.test.output
testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
}
@@ -553,7 +553,7 @@ project(":samza-kv_$scalaVersion") {
compile project(":samza-core_$scalaVersion")
compile "org.scala-lang:scala-library:$scalaLibVersion"
testCompile "junit:junit:$junitVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
}
checkstyle {
@@ -658,7 +658,7 @@ project(":samza-rest") {
testCompile "junit:junit:$junitVersion"
testCompile "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:$jerseyVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
}
tasks.create(name: "releaseRestServiceTar", type: Tar) {
@@ -731,7 +731,7 @@ project(":samza-test_$scalaVersion") {
testCompile "org.apache.kafka:kafka-clients:$kafkaVersion:test"
testCompile project(":samza-core_$scalaVersion").sourceSets.test.output
testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion"
- testCompile "org.mockito:mockito-all:$mockitoVersion"
+ testCompile "org.mockito:mockito-core:$mockitoVersion"
testRuntime "org.slf4j:slf4j-simple:$slf4jVersion"
}