Repository: incubator-ranger Updated Branches: refs/heads/master e6ae22fd2 -> 6b22ecbac
RANGER-948 - Some tasks to cleanup test dependencies: Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/6b22ecba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/6b22ecba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/6b22ecba Branch: refs/heads/master Commit: 6b22ecbac319f69c1e20abc4ba92c632e11d3a08 Parents: e6ae22f Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Apr 25 10:47:56 2016 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Apr 26 10:46:53 2016 +0100 ---------------------------------------------------------------------- agents-cred/pom.xml | 4 ---- credentialbuilder/pom.xml | 5 ----- hbase-agent/pom.xml | 4 ---- hdfs-agent/pom.xml | 4 ---- kms/pom.xml | 9 +-------- knox-agent/pom.xml | 8 -------- pom.xml | 18 ++---------------- ranger-hbase-plugin-shim/pom.xml | 8 -------- ranger-hdfs-plugin-shim/pom.xml | 4 ---- ranger-hive-plugin-shim/pom.xml | 4 ---- ranger-knox-plugin-shim/pom.xml | 8 -------- security-admin/pom.xml | 12 ------------ src/main/assembly/admin-web.xml | 1 - src/main/assembly/hbase-agent.xml | 1 - src/main/assembly/hdfs-agent.xml | 1 - src/main/assembly/hive-agent.xml | 1 - src/main/assembly/kms.xml | 2 -- src/main/assembly/knox-agent.xml | 1 - src/main/assembly/plugin-kafka.xml | 1 - src/main/assembly/plugin-kms.xml | 1 - src/main/assembly/plugin-solr.xml | 1 - src/main/assembly/plugin-yarn.xml | 1 - src/main/assembly/storm-agent.xml | 1 - ugsync/pom.xml | 4 ++++ 24 files changed, 7 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/agents-cred/pom.xml ---------------------------------------------------------------------- diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml index 673dbc1..a800943 100644 --- a/agents-cred/pom.xml +++ b/agents-cred/pom.xml @@ -50,9 +50,5 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/credentialbuilder/pom.xml ---------------------------------------------------------------------- diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml index bf34222..65b012c 100644 --- a/credentialbuilder/pom.xml +++ b/credentialbuilder/pom.xml @@ -59,11 +59,6 @@ <version>${google.guava.version}</version> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>${hamcrest.all.version}</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/hbase-agent/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-agent/pom.xml b/hbase-agent/pom.xml index 84adc75..4a2a25f 100644 --- a/hbase-agent/pom.xml +++ b/hbase-agent/pom.xml @@ -64,9 +64,5 @@ <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-integration</artifactId> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/hdfs-agent/pom.xml ---------------------------------------------------------------------- diff --git a/hdfs-agent/pom.xml b/hdfs-agent/pom.xml index 5918f9f..f5e42eb 100644 --- a/hdfs-agent/pom.xml +++ b/hdfs-agent/pom.xml @@ -123,10 +123,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> </dependencies> <build> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/kms/pom.xml ---------------------------------------------------------------------- diff --git a/kms/pom.xml b/kms/pom.xml index 03f7992..af2138a 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -113,11 +113,6 @@ <artifactId>log4jdbc</artifactId> <version>${googlecode.log4jdbc.version}</version> </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>${mysql-connector-java.version}</version> - </dependency> <!-- Hadoop KMS dependency --> <!-- <dependency> <groupId>org.apache.hadoop</groupId> @@ -131,9 +126,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> + <artifactId>mockito-core</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/knox-agent/pom.xml ---------------------------------------------------------------------- diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml index 77e27fb..20d8237 100644 --- a/knox-agent/pom.xml +++ b/knox-agent/pom.xml @@ -53,14 +53,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-integration</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> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1f4e9ac..aef42c6 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,6 @@ <hadoop-common.version>2.7.0</hadoop-common.version> <hadoop.minikdc.version>2.3.0</hadoop.minikdc.version> <hadoop.version>2.7.0</hadoop.version> - <hamcrest-version>1.3</hamcrest-version> <hamcrest.all.version>1.3</hamcrest.all.version> <hbase.version>1.1.3</hbase.version> <hive.version>2.1.0-SNAPSHOT</hive.version> @@ -190,7 +189,6 @@ <owasp-java-html-sanitizer.version>r239</owasp-java-html-sanitizer.version> <paranamer.version>2.3</paranamer.version> <poi.version>3.12</poi.version> - <powermock.version>1.5.6</powermock.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <protobuf-java.version>2.5.0</protobuf-java.version> <ranger.solrj.version>${project.version}</ranger.solrj.version> @@ -290,21 +288,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>${powermock.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>${powermock.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-integration</artifactId> - <version>${hamcrest-version}</version> + <artifactId>hamcrest-all</artifactId> + <version>${hamcrest.all.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/ranger-hbase-plugin-shim/pom.xml ---------------------------------------------------------------------- diff --git a/ranger-hbase-plugin-shim/pom.xml b/ranger-hbase-plugin-shim/pom.xml index 0b68216..cb33a76 100644 --- a/ranger-hbase-plugin-shim/pom.xml +++ b/ranger-hbase-plugin-shim/pom.xml @@ -60,13 +60,5 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-integration</artifactId> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/ranger-hdfs-plugin-shim/pom.xml ---------------------------------------------------------------------- diff --git a/ranger-hdfs-plugin-shim/pom.xml b/ranger-hdfs-plugin-shim/pom.xml index 0fa9e7c..0522697 100644 --- a/ranger-hdfs-plugin-shim/pom.xml +++ b/ranger-hdfs-plugin-shim/pom.xml @@ -47,10 +47,6 @@ <version>${hadoop.version}</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> <groupId>org.apache.ranger</groupId> <artifactId>ranger-plugins-audit</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/ranger-hive-plugin-shim/pom.xml ---------------------------------------------------------------------- diff --git a/ranger-hive-plugin-shim/pom.xml b/ranger-hive-plugin-shim/pom.xml index 4fabb3f..938579f 100644 --- a/ranger-hive-plugin-shim/pom.xml +++ b/ranger-hive-plugin-shim/pom.xml @@ -92,9 +92,5 @@ <artifactId>ranger-plugin-classloader</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/ranger-knox-plugin-shim/pom.xml ---------------------------------------------------------------------- diff --git a/ranger-knox-plugin-shim/pom.xml b/ranger-knox-plugin-shim/pom.xml index 8a97917..6aec6d6 100644 --- a/ranger-knox-plugin-shim/pom.xml +++ b/ranger-knox-plugin-shim/pom.xml @@ -54,14 +54,6 @@ <artifactId>junit</artifactId> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-integration</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> <version>${codehaus.jackson.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/security-admin/pom.xml ---------------------------------------------------------------------- diff --git a/security-admin/pom.xml b/security-admin/pom.xml index e6c8edf..9f4ecbe 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -163,11 +163,6 @@ <version>${google.guava.version}</version> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>${hamcrest.all.version}</version> - </dependency> - <dependency> <groupId>net.htmlparser.jericho</groupId> <artifactId>jericho-html</artifactId> <version>${jericho.html.version}</version> @@ -271,13 +266,6 @@ <artifactId>log4jdbc</artifactId> <version>${googlecode.log4jdbc.version}</version> </dependency> - <!-- - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>${mysql-connector-java.version}</version> - </dependency> - --> <dependency> <groupId>com.googlecode.owasp-java-html-sanitizer</groupId> <artifactId>owasp-java-html-sanitizer</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/admin-web.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/admin-web.xml b/src/main/assembly/admin-web.xml index 8087374..6aeb397 100644 --- a/src/main/assembly/admin-web.xml +++ b/src/main/assembly/admin-web.xml @@ -236,7 +236,6 @@ <include>commons-lang:commons-lang</include> <include>commons-logging:commons-logging</include> <include>com.google.guava:guava</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api</include> <include>org.apache.hadoop:hadoop-common</include> <include>org.apache.hadoop:hadoop-auth</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/hbase-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hbase-agent.xml b/src/main/assembly/hbase-agent.xml index 9169248..8a47ef1 100644 --- a/src/main/assembly/hbase-agent.xml +++ b/src/main/assembly/hbase-agent.xml @@ -83,7 +83,6 @@ <include>commons-lang:commons-lang</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${google.guava.version}</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/hdfs-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hdfs-agent.xml b/src/main/assembly/hdfs-agent.xml index 978b1f6..f0fbe19 100644 --- a/src/main/assembly/hdfs-agent.xml +++ b/src/main/assembly/hdfs-agent.xml @@ -54,7 +54,6 @@ <include>commons-lang:commons-lang</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${google.guava.version}</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/hive-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hive-agent.xml b/src/main/assembly/hive-agent.xml index 611b71b..d79dcbf 100644 --- a/src/main/assembly/hive-agent.xml +++ b/src/main/assembly/hive-agent.xml @@ -82,7 +82,6 @@ <include>commons-lang:commons-lang</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${google.guava.version}</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml index 445b3c7..44276cc 100755 --- a/src/main/assembly/kms.xml +++ b/src/main/assembly/kms.xml @@ -211,7 +211,6 @@ <include>commons-lang:commons-lang:jar:${commons.lang.version}</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${guava.version}</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> @@ -262,7 +261,6 @@ <include>commons-lang:commons-lang</include> <include>commons-logging:commons-logging</include> <include>com.google.guava:guava</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api</include> <include>org.apache.hadoop:hadoop-common</include> <include>org.apache.hadoop:hadoop-auth</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/knox-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/knox-agent.xml b/src/main/assembly/knox-agent.xml index 431af88..0657e87 100644 --- a/src/main/assembly/knox-agent.xml +++ b/src/main/assembly/knox-agent.xml @@ -90,7 +90,6 @@ <include>commons-lang:commons-lang</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${google.guava.version}</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/plugin-kafka.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-kafka.xml b/src/main/assembly/plugin-kafka.xml index a860a7b..835cc15 100644 --- a/src/main/assembly/plugin-kafka.xml +++ b/src/main/assembly/plugin-kafka.xml @@ -92,7 +92,6 @@ </include> <include>commons-logging:commons-logging</include> <include>com.google.guava:guava:jar:${google.guava.version}</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version} </include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/plugin-kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-kms.xml b/src/main/assembly/plugin-kms.xml index 749894d..84b180d 100755 --- a/src/main/assembly/plugin-kms.xml +++ b/src/main/assembly/plugin-kms.xml @@ -63,7 +63,6 @@ <include>commons-lang:commons-lang:jar:${commons.lang.version}</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${guava.version}</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/plugin-solr.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-solr.xml b/src/main/assembly/plugin-solr.xml index 29e32f9..1ee926d 100644 --- a/src/main/assembly/plugin-solr.xml +++ b/src/main/assembly/plugin-solr.xml @@ -71,7 +71,6 @@ </include> <include>commons-logging:commons-logging</include> <include>com.google.guava:guava:jar:${guava.version}</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version} </include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/plugin-yarn.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-yarn.xml b/src/main/assembly/plugin-yarn.xml index 200694f..19e88d4 100644 --- a/src/main/assembly/plugin-yarn.xml +++ b/src/main/assembly/plugin-yarn.xml @@ -68,7 +68,6 @@ <include>commons-lang:commons-lang:jar:${commons.lang.version}</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${google.guava.version}</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/src/main/assembly/storm-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/storm-agent.xml b/src/main/assembly/storm-agent.xml index be88dd7..f4f63da 100644 --- a/src/main/assembly/storm-agent.xml +++ b/src/main/assembly/storm-agent.xml @@ -86,7 +86,6 @@ <include>commons-lang:commons-lang:jar:${commons.lang.version}</include> <include>commons-logging:commons-logging</include> <include>com.google.guava:guava:jar:${google.guava.version}</include> - <include>org.hamcrest:hamcrest-all</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6b22ecba/ugsync/pom.xml ---------------------------------------------------------------------- diff --git a/ugsync/pom.xml b/ugsync/pom.xml index 877ac7f..f18043c 100644 --- a/ugsync/pom.xml +++ b/ugsync/pom.xml @@ -145,6 +145,10 @@ <artifactId>ranger-plugins-common</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + </dependency> </dependencies> <build>
