Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-16990. Update Mockserver. Contributed by Attila Doroszlai. 

Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org>
(cherry picked from commit 8675a0d283bcf1f6a0c1e5953d28f7497c63ba66)
This commit is contained in:
Doroszlai, Attila 2020-10-08 23:43:20 -07:00 committed by Wei-Chiu Chuang
parent 7bda43fbd5
commit dd17772b53
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
View File

@ -99,6 +99,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>

2
hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFSOAuth2.java
View File

@ -31,7 +31,7 @@ import org.apache.http.HttpStatus;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockserver.client.server.MockServerClient; import org.mockserver.client.MockServerClient;
import org.mockserver.integration.ClientAndServer; import org.mockserver.integration.ClientAndServer;
import org.mockserver.model.Header; import org.mockserver.model.Header;
import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpRequest;

2
hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/oauth2/TestClientCredentialTimeBasedTokenRefresher.java
View File

@ -24,7 +24,7 @@ import org.apache.hadoop.net.ServerSocketUtil;
import org.apache.hadoop.util.Timer; import org.apache.hadoop.util.Timer;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
import org.junit.Test; import org.junit.Test;
import org.mockserver.client.server.MockServerClient; import org.mockserver.client.MockServerClient;
import org.mockserver.integration.ClientAndServer; import org.mockserver.integration.ClientAndServer;
import org.mockserver.model.Header; import org.mockserver.model.Header;
import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpRequest;

2
hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/oauth2/TestRefreshTokenTimeBasedTokenRefresher.java
View File

@ -23,7 +23,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.Timer; import org.apache.hadoop.util.Timer;
import org.apache.http.HttpStatus; import org.apache.http.HttpStatus;
import org.junit.Test; import org.junit.Test;
import org.mockserver.client.server.MockServerClient; import org.mockserver.client.MockServerClient;
import org.mockserver.integration.ClientAndServer; import org.mockserver.integration.ClientAndServer;
import org.mockserver.model.Header; import org.mockserver.model.Header;
import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpRequest;

10
hadoop-project/pom.xml
View File

@ -1012,12 +1012,20 @@
<dependency> <dependency>
<groupId>org.mock-server</groupId> <groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId> <artifactId>mockserver-netty</artifactId>
<version>3.9.2</version> <version>5.10</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>io.swagger.parser.v3</groupId>
<artifactId>swagger-parser</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>