This is an automated email from the ASF dual-hosted git repository.
wlo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new bb7e31026 [GOBBLIN-1812] Mockito should only be test compile (#3674)
bb7e31026 is described below
commit bb7e31026a65d31e54ac0963d0b0b6a12ec6d71c
Author: Matthew Ho <[email protected]>
AuthorDate: Thu Apr 13 11:19:06 2023 -0700
[GOBBLIN-1812] Mockito should only be test compile (#3674)
---
gobblin-cluster/build.gradle | 1 +
gobblin-compaction/build.gradle | 2 +-
gobblin-data-management/build.gradle | 3 +--
.../org/apache/gobblin/util/test/RetentionTestDataGenerator.java | 0
.../java/org/apache/gobblin/util/test/RetentionTestHelper.java | 0
.../test/resources/mockito-extensions/org.mockito.plugins.MockMaker | 1 +
gobblin-modules/gobblin-compliance/build.gradle | 2 ++
gobblin-runtime/build.gradle | 2 +-
.../gobblin/runtime/spec_executorInstance/MockedSpecExecutor.java | 0
gobblin-yarn/build.gradle | 1 +
gradle/scripts/dependencyDefinitions.gradle | 5 ++++-
11 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/gobblin-cluster/build.gradle b/gobblin-cluster/build.gradle
index 3493c2b15..4b68445c1 100644
--- a/gobblin-cluster/build.gradle
+++ b/gobblin-cluster/build.gradle
@@ -60,6 +60,7 @@ dependencies {
testCompile externalDependency.curatorFramework
testCompile externalDependency.curatorTest
testCompile externalDependency.assertj
+ testCompile externalDependency.mockito
}
task testJar(type: Jar, dependsOn: testClasses) {
diff --git a/gobblin-compaction/build.gradle b/gobblin-compaction/build.gradle
index 64b5fdecd..5930aabca 100644
--- a/gobblin-compaction/build.gradle
+++ b/gobblin-compaction/build.gradle
@@ -36,7 +36,6 @@ dependencies {
compile externalDependency.avro
compile externalDependency.commonsLang
compile externalDependency.commonsMath
- compile externalDependency.mockito
compile externalDependency.testng
runtimeOnly externalDependency.hadoopCommon
@@ -58,6 +57,7 @@ dependencies {
testCompile externalDependency.testng
testCompile externalDependency.calciteAvatica
+ testCompile externalDependency.mockito
}
diff --git a/gobblin-data-management/build.gradle
b/gobblin-data-management/build.gradle
index 47b8fa6b5..c3b3129ea 100644
--- a/gobblin-data-management/build.gradle
+++ b/gobblin-data-management/build.gradle
@@ -34,13 +34,11 @@ dependencies {
compile externalDependency.slf4j
compile externalDependency.jodaTime
compile externalDependency.metricsCore
- compile externalDependency.mockito
compile externalDependency.commonsCodec
compile externalDependency.commonsCompress
compile externalDependency.commonsIo
compile externalDependency.gson
compile externalDependency.commonsCodec
- compile externalDependency.mockito
compile externalDependency.typesafeConfig
compile externalDependency.findBugsAnnotations
compile externalDependency.testng
@@ -61,6 +59,7 @@ dependencies {
testCompile externalDependency.hamcrest
testCompile externalDependency.testng
testCompile externalDependency.hiveJdbc
+ testCompile externalDependency.mockito
testRuntime project(":gobblin-modules:gobblin-crypto-provider") // for GPG
testCompile project(":gobblin-modules:gobblin-crypto") // for GPG
diff --git
a/gobblin-data-management/src/main/java/org/apache/gobblin/util/test/RetentionTestDataGenerator.java
b/gobblin-data-management/src/test/java/org/apache/gobblin/util/test/RetentionTestDataGenerator.java
similarity index 100%
rename from
gobblin-data-management/src/main/java/org/apache/gobblin/util/test/RetentionTestDataGenerator.java
rename to
gobblin-data-management/src/test/java/org/apache/gobblin/util/test/RetentionTestDataGenerator.java
diff --git
a/gobblin-data-management/src/main/java/org/apache/gobblin/util/test/RetentionTestHelper.java
b/gobblin-data-management/src/test/java/org/apache/gobblin/util/test/RetentionTestHelper.java
similarity index 100%
rename from
gobblin-data-management/src/main/java/org/apache/gobblin/util/test/RetentionTestHelper.java
rename to
gobblin-data-management/src/test/java/org/apache/gobblin/util/test/RetentionTestHelper.java
diff --git
a/gobblin-data-management/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
b/gobblin-data-management/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 000000000..1f0955d45
--- /dev/null
+++
b/gobblin-data-management/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
diff --git a/gobblin-modules/gobblin-compliance/build.gradle
b/gobblin-modules/gobblin-compliance/build.gradle
index 706d7e060..d6cf3e13e 100644
--- a/gobblin-modules/gobblin-compliance/build.gradle
+++ b/gobblin-modules/gobblin-compliance/build.gradle
@@ -21,6 +21,8 @@ dependencies {
compile project(":gobblin-data-management")
compile externalDependency.azkaban
compile externalDependency.hiveJdbc
+
+ testCompile externalDependency.mockito
}
test {
diff --git a/gobblin-runtime/build.gradle b/gobblin-runtime/build.gradle
index df86c5cec..3a83c2f7f 100644
--- a/gobblin-runtime/build.gradle
+++ b/gobblin-runtime/build.gradle
@@ -80,7 +80,6 @@ dependencies {
compile externalDependency.metricsCore
compile externalDependency.metricsJvm
compile externalDependency.metricsJmx
- compile externalDependency.mockito
compile externalDependency.pegasus.data
compile externalDependency.quartz
compile externalDependency.slf4j
@@ -101,6 +100,7 @@ dependencies {
testCompile externalDependency.mockito
testRuntime externalDependency.derby
testCompile externalDependency.jmh
+ testCompile externalDependency.mockito
}
// Begin HACK to get around POM being depenendent on the (empty)
gobblin-rest-api instead of gobblin-rest-api-rest-client
diff --git
a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/spec_executorInstance/MockedSpecExecutor.java
b/gobblin-runtime/src/test/java/org/apache/gobblin/runtime/spec_executorInstance/MockedSpecExecutor.java
similarity index 100%
rename from
gobblin-runtime/src/main/java/org/apache/gobblin/runtime/spec_executorInstance/MockedSpecExecutor.java
rename to
gobblin-runtime/src/test/java/org/apache/gobblin/runtime/spec_executorInstance/MockedSpecExecutor.java
diff --git a/gobblin-yarn/build.gradle b/gobblin-yarn/build.gradle
index 8cfb22ced..0221c01b4 100644
--- a/gobblin-yarn/build.gradle
+++ b/gobblin-yarn/build.gradle
@@ -64,6 +64,7 @@ dependencies {
testCompile project(":gobblin-example")
testCompile externalDependency.testng
+ testCompile externalDependency.mockito
testCompile externalDependency.hadoopYarnMiniCluster
testCompile externalDependency.curatorFramework
testCompile externalDependency.curatorTest
diff --git a/gradle/scripts/dependencyDefinitions.gradle
b/gradle/scripts/dependencyDefinitions.gradle
index cffec8495..95f8f6c32 100644
--- a/gradle/scripts/dependencyDefinitions.gradle
+++ b/gradle/scripts/dependencyDefinitions.gradle
@@ -124,7 +124,10 @@ ext.externalDependency = [
"guiceMultibindings":
"com.google.inject.extensions:guice-multibindings:4.0",
"guiceServlet": "com.google.inject.extensions:guice-servlet:4.0",
"derby": "org.apache.derby:derby:10.12.1.1",
- "mockito": "org.mockito:mockito-inline:4.11.0", // upgraded to allow
mocking for constructors, static and final methods; specifically for iceberg
distcp
+ // NOTE: To use features from mockito-inline, follow the wiki as opposed
to changing this
+ // dependency directly to mockito-inline
+ //
https://github.com/mockito/mockito/wiki/What%27s-new-in-Mockito-2#unmockable
+ "mockito": "org.mockito:mockito-core:4.11.0",
"salesforceWsc": "com.force.api:force-wsc:" + salesforceVersion,
"salesforcePartner": "com.force.api:force-partner-api:" +
salesforceVersion,
"scala": "org.scala-lang:scala-library:2.11.8",
