mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-18 22:14:23 +00:00
Code Issues Releases Wiki Activity

Allow third_party/java_src/gtld/ to use :mockito2_for_third_party

Browse Source 
In [] a change would have been made to your project that is incompatible with
your open source integration. To make sure the open source variant of your
project remains working, we have eagerly updated your open source copy to use
Mockito 2. This CL integrates that change into [].

Please read []and
understand the consequences of this change.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=238445356
This commit is contained in:
Ben McIlwain
2019-03-20 14:25:28 -04:00
parent 1a6c068471
commit 202ed9db6a
70 changed files with 200 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/core/build.gradle
+1 -1
View File
@@ -268,7 +268,7 @@ dependencies {
testCompile deps['org.hamcrest:hamcrest-core']
testCompile deps['org.hamcrest:hamcrest-library']
testCompile deps['junit:junit']
testCompile deps['org.mockito:mockito-all']
testCompile deps['org.mockito:mockito-core']
// Indirect dependency found by undeclared-dependency check. Such
// dependencies should go after all other compile and testCompile
gradle/core/gradle/dependency-locks/compile.lockfile
+5 -4
View File
@@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.0.23
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@@ -160,6 +159,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@@ -181,14 +182,14 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.hamcrest:hamcrest-core:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0
gradle/core/gradle/dependency-locks/compileClasspath.lockfile
+5 -4
View File
@@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.0.23
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@@ -158,6 +157,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@@ -179,14 +180,14 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.hamcrest:hamcrest-core:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0
gradle/core/gradle/dependency-locks/css.lockfile
+5 -5
View File
@@ -2,7 +2,6 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
args4j:args4j:2.0.26
cglib:cglib-nodep:2.2
com.google.closure-stylesheets:closure-stylesheets:1.5.0
com.google.code.findbugs:jsr305:3.0.1
com.google.code.gson:gson:2.7
@@ -11,8 +10,9 @@ com.google.javascript:closure-compiler-externs:v20160713
com.google.javascript:closure-compiler-unshaded:v20160713
com.google.protobuf:protobuf-java:2.5.0
javacc:javacc:4.1
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
net.java.dev.javacc:javacc:4.1
org.easymock:easymock:3.0
org.hamcrest:hamcrest-core:1.1
org.mockito:mockito-core:1.10.19
org.objenesis:objenesis:2.1
org.easymock:easymock:3.5
org.mockito:mockito-core:2.25.0
org.objenesis:objenesis:2.6
gradle/core/gradle/dependency-locks/default.lockfile
+5 -4
View File
@@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.0.23
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@@ -162,6 +161,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@@ -183,7 +184,7 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@@ -191,10 +192,10 @@ org.hamcrest:hamcrest-core:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0
gradle/core/gradle/dependency-locks/runtime.lockfile
+5 -4
View File
@@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.0.23
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@@ -162,6 +161,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@@ -183,7 +184,7 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@@ -191,10 +192,10 @@ org.hamcrest:hamcrest-core:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0
gradle/core/gradle/dependency-locks/runtimeClasspath.lockfile
+5 -4
View File
@@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.0.23
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@@ -162,6 +161,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@@ -183,7 +184,7 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@@ -191,10 +192,10 @@ org.hamcrest:hamcrest-core:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0
gradle/core/gradle/dependency-locks/testCompile.lockfile
+5 -6
View File
@@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@@ -167,7 +166,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@@ -201,17 +201,16 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.hamcrest:hamcrest-all:1.3
org.hamcrest:hamcrest-core:1.3
org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0
gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile
+5 -6
View File
@@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@@ -165,7 +164,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@@ -199,17 +199,16 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.hamcrest:hamcrest-all:1.3
org.hamcrest:hamcrest-core:1.3
org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0
gradle/core/gradle/dependency-locks/testRuntime.lockfile
+5 -6
View File
@@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@@ -169,7 +168,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@@ -203,7 +203,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@@ -213,11 +213,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0
gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile
+5 -6
View File
@@ -3,7 +3,6 @@
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0
args4j:args4j:2.33
cglib:cglib-nodep:2.2
com.beust:jcommander:1.48
com.fasterxml.jackson.core:jackson-annotations:2.9.8
com.fasterxml.jackson.core:jackson-core:2.9.8
@@ -169,7 +168,8 @@ javax.xml.bind:jaxb-api:2.3.0
jline:jline:1.0
joda-time:joda-time:2.9.2
junit:junit:4.12
net.bytebuddy:byte-buddy:1.8.15
net.bytebuddy:byte-buddy:1.9.7
net.bytebuddy:byte-buddy-agent:1.9.7
org.apache.avro:avro:1.8.2
org.apache.beam:beam-model-job-management:2.11.0
org.apache.beam:beam-model-pipeline:2.11.0
@@ -203,7 +203,7 @@ org.checkerframework:checker-qual:2.5.3
org.codehaus.jackson:jackson-core-asl:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.easymock:easymock:3.0
org.easymock:easymock:3.5
org.glassfish.jaxb:jaxb-core:2.3.0
org.glassfish.jaxb:jaxb-runtime:2.3.0
org.glassfish.jaxb:txw2:2.3.0
@@ -213,11 +213,10 @@ org.hamcrest:hamcrest-library:1.3
org.joda:joda-money:0.10.0
org.json:json:20160810
org.jvnet.staxex:stax-ex:1.7.8
org.mockito:mockito-all:1.10.19
org.mockito:mockito-core:1.9.5
org.mockito:mockito-core:2.25.0
org.mortbay.jetty:jetty-util:6.1.26
org.mortbay.jetty:jetty:6.1.26
org.objenesis:objenesis:1.2
org.objenesis:objenesis:2.6
org.ow2.asm:asm-analysis:6.0
org.ow2.asm:asm-commons:6.0
org.ow2.asm:asm-tree:6.0