File tree Expand file tree Collapse file tree 2 files changed +7
-10
lines changed
Expand file tree Collapse file tree 2 files changed +7
-10
lines changed Original file line number Diff line number Diff line change @@ -37,11 +37,6 @@ retry_with_backoff 3 10 \
3737 -Dgcloud.download.skip=true \
3838 -T 1C
3939
40- echo ' ############### dependency tree'
41- pushd google-cloud-pubsub
42- mvn dependency:tree
43- popd
44-
4540# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it
4641if [[ ! -z " ${GOOGLE_APPLICATION_CREDENTIALS} " && " ${GOOGLE_APPLICATION_CREDENTIALS} " != /* ]]; then
4742 export GOOGLE_APPLICATION_CREDENTIALS=$( realpath ${KOKORO_GFILE_DIR} /${GOOGLE_APPLICATION_CREDENTIALS} )
Original file line number Diff line number Diff line change 114114 </dependency >
115115
116116 <!-- Test dependencies -->
117- <dependency >
118- <groupId >org.mockito</groupId >
119- <artifactId >mockito-core</artifactId >
120- <scope >test</scope >
121- </dependency >
122117 <dependency >
123118 <groupId >junit</groupId >
124119 <artifactId >junit</artifactId >
133128 <groupId >org.easymock</groupId >
134129 <artifactId >easymock</artifactId >
135130 <scope >test</scope >
131+ </dependency >
132+ <!-- we keep mockito after easymock in this pom so easymock's byte-buddy transitive
133+ dependency is picked up with higher priority -->
134+ <dependency >
135+ <groupId >org.mockito</groupId >
136+ <artifactId >mockito-core</artifactId >
137+ <scope >test</scope >
136138 </dependency >
137139 <dependency >
138140 <groupId >com.google.cloud</groupId >
You can’t perform that action at this time.
0 commit comments