This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push: new 568ac6ae8 RANGER-4528: Add JUnit 5 support 568ac6ae8 is described below commit 568ac6ae877623688fbf15b8ed4e5300561c60d0 Author: Kishor Gollapalliwar <kishor.gollapalli...@gmail.com> AuthorDate: Sat Nov 11 08:23:05 2023 +0530 RANGER-4528: Add JUnit 5 support Signed-off-by: Madhan Neethiraj <mad...@apache.org> --- agents-audit/pom.xml | 24 ++++-- agents-common/pom.xml | 37 +++++--- agents-cred/pom.xml | 20 +++-- credentialbuilder/pom.xml | 31 ++++--- hbase-agent/pom.xml | 95 +++++++++++---------- hdfs-agent/pom.xml | 14 ++- hive-agent/pom.xml | 19 +++-- intg/pom.xml | 14 ++- kms/pom.xml | 123 +++++++++++++++------------ knox-agent/pom.xml | 38 ++++++--- plugin-kafka/pom.xml | 71 +++++++++------- plugin-kms/pom.xml | 16 +++- plugin-kudu/pom.xml | 14 ++- plugin-kylin/pom.xml | 40 ++++++--- plugin-nifi-registry/pom.xml | 12 ++- plugin-nifi/pom.xml | 12 ++- plugin-presto/pom.xml | 30 ++++--- plugin-schema-registry/pom.xml | 22 +++-- plugin-sqoop/pom.xml | 59 +++++++------ plugin-trino/pom.xml | 30 ++++--- pom.xml | 14 ++- ranger-authn/pom.xml | 14 ++- ranger-common-ha/pom.xml | 13 ++- ranger-examples/conditions-enrichers/pom.xml | 25 ++++-- ranger-knox-plugin-shim/pom.xml | 18 +++- ranger-metrics/pom.xml | 13 ++- ranger-plugin-classloader/pom.xml | 18 +++- ranger-tools/pom.xml | 20 +++-- security-admin/pom.xml | 37 +++++--- storm-agent/pom.xml | 17 +++- tagsync/pom.xml | 28 ++++-- ugsync/pom.xml | 51 ++++++----- 32 files changed, 656 insertions(+), 333 deletions(-) diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml index 791519b39..4b80a5c4e 100644 --- a/agents-audit/pom.xml +++ b/agents-audit/pom.xml @@ -388,23 +388,35 @@ <artifactId>aws-java-sdk-bundle</artifactId> <version>${aws-java-sdk.version}</version> </dependency> + + <!-- Test --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/agents-common/pom.xml b/agents-common/pom.xml index b753c1368..12e093f78 100644 --- a/agents-common/pom.xml +++ b/agents-common/pom.xml @@ -108,20 +108,6 @@ <artifactId>commons-configuration2</artifactId> <version>${commons.configuration.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> @@ -174,5 +160,28 @@ <version>${graalvm.version}</version> </dependency> --> + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml index 5130db80e..047d210d3 100644 --- a/agents-cred/pom.xml +++ b/agents-cred/pom.xml @@ -91,15 +91,25 @@ <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>log4j-over-slf4j</artifactId> <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml index dea198b47..c18d5585c 100644 --- a/credentialbuilder/pom.xml +++ b/credentialbuilder/pom.xml @@ -53,10 +53,6 @@ <artifactId>guava</artifactId> <version>${google.guava.version}</version> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -136,12 +132,6 @@ <artifactId>commons-compress</artifactId> <version>${commons.compress.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> @@ -152,5 +142,26 @@ <artifactId>woodstox-core</artifactId> <version>${fasterxml.woodstox.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> + </dependencies> </project> diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml index 36a466a76..5b4e4313e 100644 --- a/hbase-agent/pom.xml +++ b/hbase-agent/pom.xml @@ -134,6 +134,58 @@ <artifactId>httpcore</artifactId> <version>${httpcomponents.httpcore.version}</version> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + <version>${commons.text.version}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + <version>${commons.configuration.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish</groupId> + <artifactId>javax.el</artifactId> + <version>${javax.el.version}</version> + </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> @@ -259,44 +311,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-configuration2</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - <version>${commons.text.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-configuration2</artifactId> - <version>${commons.configuration.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish</groupId> - <artifactId>javax.el</artifactId> - <version>${javax.el.version}</version> - </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> @@ -361,11 +375,6 @@ <version>${hbase.jetty.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <testResources> diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml index a23cdfea0..dece8f46f 100644 --- a/hdfs-agent/pom.xml +++ b/hdfs-agent/pom.xml @@ -116,9 +116,19 @@ <artifactId>httpcore</artifactId> <version>${httpcomponents.httpcore.version}</version> </dependency> + + <!-- Test --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/hive-agent/pom.xml b/hive-agent/pom.xml index 1e50cdd4f..8a21ab81d 100644 --- a/hive-agent/pom.xml +++ b/hive-agent/pom.xml @@ -162,6 +162,20 @@ <artifactId>javax.el</artifactId> <version>${javax.el.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-dag</artifactId> @@ -216,11 +230,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <testResources> diff --git a/intg/pom.xml b/intg/pom.xml index 191d1cfbb..4654ef7f7 100644 --- a/intg/pom.xml +++ b/intg/pom.xml @@ -126,9 +126,19 @@ </exclusion> </exclusions> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.testng</groupId> diff --git a/kms/pom.xml b/kms/pom.xml index 1be5b0ccd..2739bb81a 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -171,20 +171,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>${mockito.all.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> @@ -214,39 +200,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> - <scope>test</scope> - <type>test-jar</type> - <exclusions> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-configuration2</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -337,6 +290,12 @@ <groupId>jline</groupId> <artifactId>jline</artifactId> <version>${jline.version}</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> @@ -398,12 +357,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>${derby.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>com.microsoft.azure</groupId> <artifactId>azure</artifactId> @@ -580,6 +533,70 @@ <artifactId>ranger-metrics</artifactId> <version>${project.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito.all.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <version>${hadoop.version}</version> + <scope>test</scope> + <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-text</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> <pluginManagement> diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml index 3177fa8af..4387efb5c 100644 --- a/knox-agent/pom.xml +++ b/knox-agent/pom.xml @@ -56,16 +56,6 @@ <artifactId>javax.servlet-api</artifactId> <version>${javax.servlet.version}</version> </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> @@ -74,10 +64,6 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> <!-- TO DEBUG JERSEY2 code: Comment the two jackson depedencies to debug jersey2 code. Their presence prevents jersy2 connections to work. --> <dependency> <groupId>org.codehaus.jackson</groupId> @@ -143,6 +129,30 @@ <artifactId>httpcore</artifactId> <version>${httpcomponents.httpcore.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> diff --git a/plugin-kafka/pom.xml b/plugin-kafka/pom.xml index 0cf3d4dd1..9fa913741 100644 --- a/plugin-kafka/pom.xml +++ b/plugin-kafka/pom.xml @@ -52,22 +52,6 @@ <artifactId>kafka-clients</artifactId> <version>${kafka.version}</version> </dependency> - <dependency> - <groupId>org.apache.kafka</groupId> - <artifactId>kafka_${scala.binary.version}</artifactId> - <version>${kafka.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> @@ -97,21 +81,51 @@ </exclusions> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>${httpcomponents.httpcore.version}</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>${httpcomponents.httpcore.version}</version> - </dependency> - <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>${commons.codec.version}</version> - </dependency> + </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>kafka_${scala.binary.version}</artifactId> + <version>${kafka.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-epoll</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> @@ -130,11 +144,6 @@ <version>${bouncycastle.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13</version> - </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> diff --git a/plugin-kms/pom.xml b/plugin-kms/pom.xml index 8e33b4c46..42e8ec25d 100644 --- a/plugin-kms/pom.xml +++ b/plugin-kms/pom.xml @@ -51,6 +51,20 @@ <artifactId>httpcore</artifactId> <version>${httpcomponents.httpcore.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> @@ -60,8 +74,8 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <scope>test</scope> </dependency> - </dependencies> <build> <testResources> diff --git a/plugin-kudu/pom.xml b/plugin-kudu/pom.xml index 497c1c2f7..53b800293 100644 --- a/plugin-kudu/pom.xml +++ b/plugin-kudu/pom.xml @@ -48,13 +48,23 @@ <version>${project.version}</version> </dependency> + <!-- Test --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/plugin-kylin/pom.xml b/plugin-kylin/pom.xml index 7a51744f0..9a56b20df 100644 --- a/plugin-kylin/pom.xml +++ b/plugin-kylin/pom.xml @@ -32,20 +32,6 @@ <relativePath>..</relativePath> </parent> <dependencies> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-test</artifactId> - <version>${springframework.security.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> <dependency> <groupId>org.apache.calcite</groupId> <artifactId>calcite-linq4j</artifactId> @@ -138,6 +124,32 @@ <artifactId>httpcore</artifactId> <version>${httpcomponents.httpcore.version}</version> </dependency> + + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-test</artifactId> + <version>${springframework.security.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> diff --git a/plugin-nifi-registry/pom.xml b/plugin-nifi-registry/pom.xml index 785f85ffb..c0d768c8c 100644 --- a/plugin-nifi-registry/pom.xml +++ b/plugin-nifi-registry/pom.xml @@ -49,9 +49,17 @@ <version>${project.version}</version> </dependency> + <!-- Test --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/plugin-nifi/pom.xml b/plugin-nifi/pom.xml index f786d4d35..fe1eaa46f 100644 --- a/plugin-nifi/pom.xml +++ b/plugin-nifi/pom.xml @@ -47,9 +47,17 @@ <version>${project.version}</version> </dependency> + <!-- Test --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/plugin-presto/pom.xml b/plugin-presto/pom.xml index 5cdad44c0..4ad4e4e12 100644 --- a/plugin-presto/pom.xml +++ b/plugin-presto/pom.xml @@ -66,12 +66,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> @@ -82,15 +76,31 @@ <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> <version>${protobuf-java.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> <testResources> diff --git a/plugin-schema-registry/pom.xml b/plugin-schema-registry/pom.xml index 50169ef44..4be8cff8d 100644 --- a/plugin-schema-registry/pom.xml +++ b/plugin-schema-registry/pom.xml @@ -205,10 +205,23 @@ <artifactId>jettison</artifactId> <version>${jettison.version}</version> </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey.version}</version> + </dependency> + <!-- Test --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> <scope>test</scope> </dependency> <dependency> @@ -243,11 +256,6 @@ <version>${servlet-api.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - <version>${jersey.version}</version> - </dependency> </dependencies> <build> diff --git a/plugin-sqoop/pom.xml b/plugin-sqoop/pom.xml index f7830dc3d..d6be86bc3 100644 --- a/plugin-sqoop/pom.xml +++ b/plugin-sqoop/pom.xml @@ -32,30 +32,6 @@ <relativePath>..</relativePath> </parent> <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.sqoop</groupId> - <artifactId>sqoop-security</artifactId> - <version>${sqoop.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.sqoop</groupId> <artifactId>sqoop-core</artifactId> @@ -92,6 +68,41 @@ <artifactId>httpcore</artifactId> <version>${httpcomponents.httpcore.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.sqoop</groupId> + <artifactId>sqoop-security</artifactId> + <version>${sqoop.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>log4j-over-slf4j</artifactId> diff --git a/plugin-trino/pom.xml b/plugin-trino/pom.xml index e7c82edfa..1cd35e987 100644 --- a/plugin-trino/pom.xml +++ b/plugin-trino/pom.xml @@ -66,12 +66,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-common</artifactId> @@ -87,10 +81,6 @@ <artifactId>commons-lang3</artifactId> <version>${commons.lang3.version}</version> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> @@ -126,6 +116,26 @@ <artifactId>dnsjava</artifactId> <version>${dnsjava.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> <testResources> diff --git a/pom.xml b/pom.xml index 6f3094c48..0312334f7 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ <jsonsmart.version>2.4.10</jsonsmart.version> <jsr250.version>1.0</jsr250.version> <jsr305.version>1.3.9</jsr305.version> - <junit.version>4.13.1</junit.version> + <junit.jupiter.version>5.10.0</junit.jupiter.version> <kafka.version>2.8.1</kafka.version> <kerby.version>2.0.3</kerby.version> <knox.gateway.version>1.4.0</knox.gateway.version> @@ -892,9 +892,15 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/ranger-authn/pom.xml b/ranger-authn/pom.xml index d027c7004..4ee98f8a5 100644 --- a/ranger-authn/pom.xml +++ b/ranger-authn/pom.xml @@ -71,7 +71,7 @@ <version>${commons.lang.version}</version> </dependency> - <!-- JWT --> + <!-- JWT --> <dependency> <groupId>com.nimbusds</groupId> <artifactId>nimbus-jose-jwt</artifactId> @@ -80,8 +80,16 @@ <!-- Test --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/ranger-common-ha/pom.xml b/ranger-common-ha/pom.xml index 267f75331..2faa243e4 100644 --- a/ranger-common-ha/pom.xml +++ b/ranger-common-ha/pom.xml @@ -115,9 +115,18 @@ <artifactId>jsr250-api</artifactId> <scope>provided</scope> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/ranger-examples/conditions-enrichers/pom.xml b/ranger-examples/conditions-enrichers/pom.xml index 1fff9e793..70e9c6c74 100644 --- a/ranger-examples/conditions-enrichers/pom.xml +++ b/ranger-examples/conditions-enrichers/pom.xml @@ -27,17 +27,28 @@ </parent> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.apache.ranger</groupId> + <artifactId>ranger-plugins-common</artifactId> + <version>${project.version}</version> </dependency> + + <!-- Test --> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.ranger</groupId> - <artifactId>ranger-plugins-common</artifactId> - <version>${project.version}</version> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/ranger-knox-plugin-shim/pom.xml b/ranger-knox-plugin-shim/pom.xml index fbf4e4d10..e83e4296a 100644 --- a/ranger-knox-plugin-shim/pom.xml +++ b/ranger-knox-plugin-shim/pom.xml @@ -59,10 +59,6 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> @@ -88,5 +84,19 @@ <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/ranger-metrics/pom.xml b/ranger-metrics/pom.xml index 1b0f860dc..cd877962a 100644 --- a/ranger-metrics/pom.xml +++ b/ranger-metrics/pom.xml @@ -63,12 +63,21 @@ <!-- Test --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/ranger-plugin-classloader/pom.xml b/ranger-plugin-classloader/pom.xml index bcc02812a..097d099c9 100644 --- a/ranger-plugin-classloader/pom.xml +++ b/ranger-plugin-classloader/pom.xml @@ -31,14 +31,24 @@ <version>3.0.0-SNAPSHOT</version> </parent> <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/ranger-tools/pom.xml b/ranger-tools/pom.xml index 1bff58c1d..cac8d7ba3 100644 --- a/ranger-tools/pom.xml +++ b/ranger-tools/pom.xml @@ -30,10 +30,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> @@ -62,7 +58,21 @@ <groupId>be.ceau</groupId> <artifactId>chart</artifactId> <version>2.2.0</version> - </dependency> + </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> <pluginManagement> diff --git a/security-admin/pom.xml b/security-admin/pom.xml index 05fa7d836..fc59287d0 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -375,14 +375,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> <dependency> <groupId>com.googlecode.log4jdbc</groupId> <artifactId>log4jdbc</artifactId> @@ -638,11 +630,6 @@ <artifactId>ugsync-util</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${springframework.test.version}</version> - </dependency> <dependency> <groupId>com.nimbusds</groupId> <artifactId>nimbus-jose-jwt</artifactId> @@ -777,6 +764,30 @@ <artifactId>ranger-metrics</artifactId> <version>${project.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${springframework.test.version}</version> + </dependency> </dependencies> <build> <pluginManagement> diff --git a/storm-agent/pom.xml b/storm-agent/pom.xml index 91f78d881..5b9ab4da0 100644 --- a/storm-agent/pom.xml +++ b/storm-agent/pom.xml @@ -178,9 +178,20 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> - </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/tagsync/pom.xml b/tagsync/pom.xml index 1df1ccb64..a1445fdd8 100644 --- a/tagsync/pom.xml +++ b/tagsync/pom.xml @@ -30,15 +30,6 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>log4j-over-slf4j</artifactId> @@ -313,5 +304,24 @@ <artifactId>guava</artifactId> <version>${google.guava.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/ugsync/pom.xml b/ugsync/pom.xml index ecb03c97a..ed06fd718 100644 --- a/ugsync/pom.xml +++ b/ugsync/pom.xml @@ -141,10 +141,6 @@ <artifactId>ranger-util</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> @@ -165,22 +161,6 @@ <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest</artifactId> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-core-annotations</artifactId> - <version>${apacheds.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-core-integ</artifactId> - <version>${apacheds.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> @@ -201,6 +181,37 @@ <artifactId>ranger-common-ha</artifactId> <version>${project.version}</version> </dependency> + + <!-- Test --> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.directory.server</groupId> + <artifactId>apacheds-core-annotations</artifactId> + <version>${apacheds.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.directory.server</groupId> + <artifactId>apacheds-core-integ</artifactId> + <version>${apacheds.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build>