Skip to content

Commit fbebd93

Browse files
muskan1012muskan1012
committed
replaced mockito-core with mockito-inline and addressed compilation error
1 parent ece0aa5 commit fbebd93

File tree

54 files changed

+94
-65
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+94
-65
lines changed

‎hadoop-client-modules/hadoop-client-minicluster/pom.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@
403403
<!-- Add back in Mockito since the hadoop-hdfs test jar needs it. -->
404404
<dependency>
405405
<groupId>org.mockito</groupId>
406-
<artifactId>mockito-core</artifactId>
406+
<artifactId>mockito-inline</artifactId>
407407
<optional>true</optional>
408408
</dependency>
409409
<!-- Add back in the transitive dependencies excluded from hadoop-common in client TODO remove once we have a filter for "is in these artifacts" -->
@@ -761,7 +761,7 @@
761761

762762
<!-- Mockito tries to include its own unrelocated copy of hamcrest. :( -->
763763
<filter>
764-
<artifact>org.mockito:mockito-core</artifact>
764+
<artifact>org.mockito:mockito-inline</artifact>
765765
<excludes>
766766
<exclude>asm-license.txt</exclude>
767767
<exclude>cglib-license.txt</exclude>
@@ -773,6 +773,15 @@
773773
<exclude>org/objenesis/*.class</exclude>
774774
</excludes>
775775
</filter>
776+
<!-- Additional filters to exclude unexpected contents -->
777+
<filter>
778+
<artifact>*:*</artifact>
779+
<excludes>
780+
<exclude>mockito-extensions/**</exclude>
781+
<exclude>win32-x86/**</exclude>
782+
<exclude>win32-x86-64/**</exclude>
783+
</excludes>
784+
</filter>
776785
<!-- skip grizzly internals we don't need to run. -->
777786
<filter>
778787
<artifact>org.glassfish.grizzly:grizzly-http-servlet</artifact>

‎hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,24 @@
176176
<artifactId>powermock-api-mockito</artifactId>
177177
<version>1.7.4</version>
178178
<scope>test</scope>
179+
<exclusions>
180+
<exclusion>
181+
<groupId>org.mockito</groupId>
182+
<artifactId>mockito-core</artifactId>
183+
</exclusion>
184+
</exclusions>
179185
</dependency>
180186
<dependency>
181187
<groupId>org.powermock</groupId>
182188
<artifactId>powermock-module-junit4</artifactId>
183189
<version>1.7.4</version>
184190
<scope>test</scope>
191+
<exclusions>
192+
<exclusion>
193+
<groupId>org.mockito</groupId>
194+
<artifactId>mockito-core</artifactId>
195+
</exclusion>
196+
</exclusions>
185197
</dependency>
186198
</dependencies>
187199
</project>

‎hadoop-common-project/hadoop-auth/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</dependency>
4949
<dependency>
5050
<groupId>org.mockito</groupId>
51-
<artifactId>mockito-core</artifactId>
51+
<artifactId>mockito-inline</artifactId>
5252
<scope>test</scope>
5353
</dependency>
5454
<dependency>

‎hadoop-common-project/hadoop-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
</dependency>
246246
<dependency>
247247
<groupId>org.mockito</groupId>
248-
<artifactId>mockito-core</artifactId>
248+
<artifactId>mockito-inline</artifactId>
249249
<scope>test</scope>
250250
</dependency>
251251
<dependency>

‎hadoop-common-project/hadoop-kms/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</dependency>
4646
<dependency>
4747
<groupId>org.mockito</groupId>
48-
<artifactId>mockito-core</artifactId>
48+
<artifactId>mockito-inline</artifactId>
4949
<scope>test</scope>
5050
</dependency>
5151
<dependency>

‎hadoop-common-project/hadoop-nfs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</dependency>
6161
<dependency>
6262
<groupId>org.mockito</groupId>
63-
<artifactId>mockito-core</artifactId>
63+
<artifactId>mockito-inline</artifactId>
6464
<scope>test</scope>
6565
</dependency>
6666
<dependency>

‎hadoop-hdfs-project/hadoop-hdfs-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
6666
</dependency>
6767
<dependency>
6868
<groupId>org.mockito</groupId>
69-
<artifactId>mockito-core</artifactId>
69+
<artifactId>mockito-inline</artifactId>
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>

‎hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</dependency>
5050
<dependency>
5151
<groupId>org.mockito</groupId>
52-
<artifactId>mockito-core</artifactId>
52+
<artifactId>mockito-inline</artifactId>
5353
<scope>test</scope>
5454
</dependency>
5555
<dependency>

‎hadoop-hdfs-project/hadoop-hdfs-native-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
6969
</dependency>
7070
<dependency>
7171
<groupId>org.mockito</groupId>
72-
<artifactId>mockito-core</artifactId>
72+
<artifactId>mockito-inline</artifactId>
7373
<scope>test</scope>
7474
</dependency>
7575
<dependency>

‎hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
160160
</dependency>
161161
<dependency>
162162
<groupId>org.mockito</groupId>
163-
<artifactId>mockito-core</artifactId>
163+
<artifactId>mockito-inline</artifactId>
164164
<scope>test</scope>
165165
</dependency>
166166
<dependency>

0 commit comments

Comments
 (0)