Repository: incubator-ranger Updated Branches: refs/heads/master 35c4d34f6 -> f452c640c
RANGER-1118 - Consolidate on a single Hadoop version Reviewed by: bo...@apache.org Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/f452c640 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/f452c640 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/f452c640 Branch: refs/heads/master Commit: f452c640ce84d2e7709056c20295aaef72a47449 Parents: 35c4d34 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Mon Jul 25 12:22:03 2016 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Jul 25 12:22:03 2016 +0100 ---------------------------------------------------------------------- agents-audit/pom.xml | 2 +- agents-common/pom.xml | 2 +- agents-cred/pom.xml | 2 +- credentialbuilder/pom.xml | 4 ++-- kms/pom.xml | 15 ++++----------- plugin-atlas/pom.xml | 2 +- pom.xml | 4 ---- ranger-examples/plugin-sampleapp/pom.xml | 2 +- .../src/main/assembly/plugin-sampleapp.xml | 4 ++-- ranger-util/pom.xml | 2 +- security-admin/pom.xml | 2 +- src/main/assembly/admin-web.xml | 2 +- src/main/assembly/hbase-agent.xml | 4 ++-- src/main/assembly/hdfs-agent.xml | 4 ++-- src/main/assembly/hive-agent.xml | 4 ++-- src/main/assembly/kms.xml | 8 ++++---- src/main/assembly/knox-agent.xml | 6 +++--- src/main/assembly/plugin-atlas.xml | 4 ++-- src/main/assembly/plugin-kafka.xml | 10 +++++----- src/main/assembly/plugin-kms.xml | 6 +++--- src/main/assembly/plugin-solr.xml | 4 ++-- src/main/assembly/plugin-yarn.xml | 4 ++-- src/main/assembly/ranger-tools.xml | 6 +++--- src/main/assembly/storm-agent.xml | 8 ++++---- ugsync/pom.xml | 2 +- unixauthclient/pom.xml | 2 +- unixauthservice/pom.xml | 2 +- 27 files changed, 53 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/agents-audit/pom.xml ---------------------------------------------------------------------- diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml index c7a6b39..1e56a7f 100644 --- a/agents-audit/pom.xml +++ b/agents-audit/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop-common.version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/agents-common/pom.xml ---------------------------------------------------------------------- diff --git a/agents-common/pom.xml b/agents-common/pom.xml index 05c9a1d..f85c0e6 100644 --- a/agents-common/pom.xml +++ b/agents-common/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop-common.version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>log4j</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/agents-cred/pom.xml ---------------------------------------------------------------------- diff --git a/agents-cred/pom.xml b/agents-cred/pom.xml index 98e41f2..b43ce7c 100644 --- a/agents-cred/pom.xml +++ b/agents-cred/pom.xml @@ -39,7 +39,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop-common.version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>log4j</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/credentialbuilder/pom.xml ---------------------------------------------------------------------- diff --git a/credentialbuilder/pom.xml b/credentialbuilder/pom.xml index ce7b63c..4b2cc5b 100644 --- a/credentialbuilder/pom.xml +++ b/credentialbuilder/pom.xml @@ -70,12 +70,12 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop-common.version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>${hadoop-auth.version}</version> + <version>${hadoop.version}</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/kms/pom.xml ---------------------------------------------------------------------- diff --git a/kms/pom.xml b/kms/pom.xml index 6ac962f..f37f118 100644 --- a/kms/pom.xml +++ b/kms/pom.xml @@ -30,13 +30,13 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-kms</artifactId> - <version>${hadoop-common-kms.version}</version> + <version>${hadoop.version}</version> <type>war</type> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop-common.version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> @@ -113,13 +113,6 @@ <artifactId>log4jdbc</artifactId> <version>${googlecode.log4jdbc.version}</version> </dependency> - <!-- Hadoop KMS dependency --> - <!-- <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-minikdc</artifactId> - <version>${hadoop.minikdc.version}</version> - <scope>test</scope> - </dependency> --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -131,7 +124,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>${hadoop-auth.version}</version> + <version>${hadoop.version}</version> <scope>compile</scope> </dependency> <dependency> @@ -319,7 +312,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> - <version>${hadoop-auth.version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.htrace</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/plugin-atlas/pom.xml ---------------------------------------------------------------------- diff --git a/plugin-atlas/pom.xml b/plugin-atlas/pom.xml index 7f2c0f9..de3633e 100644 --- a/plugin-atlas/pom.xml +++ b/plugin-atlas/pom.xml @@ -68,7 +68,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>${hadoop-auth.version}</version> + <version>${hadoop.version}</version> <scope>compile</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5e442c4..0abb7f3 100644 --- a/pom.xml +++ b/pom.xml @@ -156,10 +156,6 @@ <gson.version>2.2.4</gson.version> <guava.version>11.0.2</guava.version> <guice.version>4.0</guice.version> - <hadoop-auth.version>2.7.1</hadoop-auth.version> - <hadoop-common-kms.version>2.7.1</hadoop-common-kms.version> - <hadoop-common.version>2.7.1</hadoop-common.version> - <hadoop.minikdc.version>2.3.0</hadoop.minikdc.version> <hadoop.version>2.7.1</hadoop.version> <hamcrest.all.version>1.3</hamcrest.all.version> <hbase.version>1.1.3</hbase.version> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/ranger-examples/plugin-sampleapp/pom.xml ---------------------------------------------------------------------- diff --git a/ranger-examples/plugin-sampleapp/pom.xml b/ranger-examples/plugin-sampleapp/pom.xml index 80c4b28..1fa90e0 100644 --- a/ranger-examples/plugin-sampleapp/pom.xml +++ b/ranger-examples/plugin-sampleapp/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop-common.version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>commons-configuration</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/ranger-examples/src/main/assembly/plugin-sampleapp.xml ---------------------------------------------------------------------- diff --git a/ranger-examples/src/main/assembly/plugin-sampleapp.xml b/ranger-examples/src/main/assembly/plugin-sampleapp.xml index de6b9a1..42d2e2d 100644 --- a/ranger-examples/src/main/assembly/plugin-sampleapp.xml +++ b/ranger-examples/src/main/assembly/plugin-sampleapp.xml @@ -34,8 +34,8 @@ <include>org.apache.ranger:ranger-plugins-audit</include> <include>org.apache.httpcomponents:httpmime:jar:${httpcomponent.httpmime.version}</include> <include>org.noggit:noggit:jar:${noggit.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> - <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>commons-collections:commons-collections</include> <include>commons-configuration:commons-configuration:jar:${commons.configuration.version}</include> <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/ranger-util/pom.xml ---------------------------------------------------------------------- diff --git a/ranger-util/pom.xml b/ranger-util/pom.xml index 8e26142..07092d7 100644 --- a/ranger-util/pom.xml +++ b/ranger-util/pom.xml @@ -29,7 +29,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> - <version>${hadoop-common.version}</version> + <version>${hadoop.version}</version> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/security-admin/pom.xml ---------------------------------------------------------------------- diff --git a/security-admin/pom.xml b/security-admin/pom.xml index db83a0a..01d5fb8 100644 --- a/security-admin/pom.xml +++ b/security-admin/pom.xml @@ -329,7 +329,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop-common.version}</version> + <version>${hadoop.version}</version> <exclusions> <exclusion> <groupId>commons-httpclient</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/admin-web.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/admin-web.xml b/src/main/assembly/admin-web.xml index 7395add..73c50bb 100644 --- a/src/main/assembly/admin-web.xml +++ b/src/main/assembly/admin-web.xml @@ -201,7 +201,7 @@ <include>org.apache.tomcat.embed:tomcat-embed*</include> <include>org.eclipse.jdt.core.compiler:ecj:jar:P20140317-1600</include> <include>log4j:log4j</include> - <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>org.apache.ranger:ranger-plugins-common</include> <include>org.slf4j:slf4j-api</include> <include>org.apache.hadoop:hadoop-common</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/hbase-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hbase-agent.xml b/src/main/assembly/hbase-agent.xml index 0c66dac..3ebc334 100644 --- a/src/main/assembly/hbase-agent.xml +++ b/src/main/assembly/hbase-agent.xml @@ -84,8 +84,8 @@ <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${google.guava.version}</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> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> </includes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/hdfs-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hdfs-agent.xml b/src/main/assembly/hdfs-agent.xml index 95901f4..63e426a 100644 --- a/src/main/assembly/hdfs-agent.xml +++ b/src/main/assembly/hdfs-agent.xml @@ -55,8 +55,8 @@ <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${google.guava.version}</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> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> </includes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/hive-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/hive-agent.xml b/src/main/assembly/hive-agent.xml index c4d8835..ca65c80 100644 --- a/src/main/assembly/hive-agent.xml +++ b/src/main/assembly/hive-agent.xml @@ -84,8 +84,8 @@ <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${google.guava.version}</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> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> </includes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml index 1390642..5c65c77 100755 --- a/src/main/assembly/kms.xml +++ b/src/main/assembly/kms.xml @@ -35,8 +35,8 @@ <outputDirectory>/ews/webapp/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> - <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-auth.version}</include> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>org.eclipse.persistence:eclipselink</include> <include>org.eclipse.persistence:javax.persistence</include> <include>com.googlecode.log4jdbc:log4jdbc</include> @@ -229,8 +229,8 @@ <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${guava.version}</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> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> </includes> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/knox-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/knox-agent.xml b/src/main/assembly/knox-agent.xml index 1b13078..8357d49 100644 --- a/src/main/assembly/knox-agent.xml +++ b/src/main/assembly/knox-agent.xml @@ -57,7 +57,7 @@ <include>org.noggit:noggit:jar:${noggit.version}</include> <include>com.google.protobuf:protobuf-java:jar:${protobuf-java.version}</include> <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> <include>org.apache.htrace:htrace-core:jar:${htrace-core.version}</include> <include>org.codehaus.jackson:jackson-core-asl:jar:${codehaus.jackson.version}</include> <include>org.codehaus.jackson:jackson-mapper-asl:jar:${codehaus.jackson.version}</include> @@ -93,8 +93,8 @@ <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${google.guava.version}</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> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> </includes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/plugin-atlas.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-atlas.xml b/src/main/assembly/plugin-atlas.xml index 6e78db5..fd98811 100644 --- a/src/main/assembly/plugin-atlas.xml +++ b/src/main/assembly/plugin-atlas.xml @@ -74,8 +74,8 @@ <include>commons-logging:commons-logging</include> <include>com.google.guava:guava:jar:${atlas.guava.version}</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> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> </includes> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/plugin-kafka.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-kafka.xml b/src/main/assembly/plugin-kafka.xml index 4c65055..0a74b8c 100644 --- a/src/main/assembly/plugin-kafka.xml +++ b/src/main/assembly/plugin-kafka.xml @@ -46,11 +46,11 @@ <includes> <include>commons-configuration:commons-configuration:jar:${commons.configuration.version} </include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version} + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version} </include> - <include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop-common.version} + <include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop.version} </include> - <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version} + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version} </include> <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include> <include>com.google.code.gson:gson</include> @@ -94,9 +94,9 @@ <include>commons-logging:commons-logging</include> <include>com.google.guava:guava:jar:${google.guava.version}</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version} + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version} </include> - <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version} + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version} </include> <include>org.apache.ranger:ranger-plugins-cred </include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/plugin-kms.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-kms.xml b/src/main/assembly/plugin-kms.xml index 69fe437..6d15f2a 100755 --- a/src/main/assembly/plugin-kms.xml +++ b/src/main/assembly/plugin-kms.xml @@ -49,7 +49,7 @@ <unpack>false</unpack> <includes> <include>commons-configuration:commons-configuration:jar:${commons.pool.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> <include>com.google.code.gson:gson</include> <include>org.eclipse.persistence:eclipselink</include> <include>org.eclipse.persistence:javax.persistence</include> @@ -78,8 +78,8 @@ <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${guava.version}</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> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> </includes> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/plugin-solr.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-solr.xml b/src/main/assembly/plugin-solr.xml index f73f204..a453a9b 100644 --- a/src/main/assembly/plugin-solr.xml +++ b/src/main/assembly/plugin-solr.xml @@ -71,9 +71,9 @@ <include>commons-logging:commons-logging</include> <include>com.google.guava:guava:jar:${guava.version}</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version} + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version} </include> - <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version} + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version} </include> <include>org.apache.ranger:ranger-plugins-cred </include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/plugin-yarn.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/plugin-yarn.xml b/src/main/assembly/plugin-yarn.xml index 93176a1..75b312c 100644 --- a/src/main/assembly/plugin-yarn.xml +++ b/src/main/assembly/plugin-yarn.xml @@ -72,8 +72,8 @@ <include>commons-logging:commons-logging:jar:${commons.logging.version}</include> <include>com.google.guava:guava:jar:${google.guava.version}</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> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> </includes> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/ranger-tools.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/ranger-tools.xml b/src/main/assembly/ranger-tools.xml index bcc9df9..249de9a 100644 --- a/src/main/assembly/ranger-tools.xml +++ b/src/main/assembly/ranger-tools.xml @@ -41,9 +41,9 @@ <include>log4j:log4j</include> <include>org.slf4j:slf4j-api:jar:${slf4j-api.version}</include> <include>commons-configuration:commons-configuration:jar:${commons.configuration.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> - <include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop-common.version}</include> - <include>org.apache.hadoop:hadoop-auth:jar:${hadoop-common.version}</include> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>org.apache.hadoop:hadoop-hdfs:jar:${hadoop.version}</include> <include>org.eclipse.persistence:eclipselink</include> <include>org.eclipse.persistence:javax.persistence</include> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/src/main/assembly/storm-agent.xml ---------------------------------------------------------------------- diff --git a/src/main/assembly/storm-agent.xml b/src/main/assembly/storm-agent.xml index 19aac06..5671d7b 100644 --- a/src/main/assembly/storm-agent.xml +++ b/src/main/assembly/storm-agent.xml @@ -49,8 +49,8 @@ <unpack>false</unpack> <includes> <include>commons-configuration:commons-configuration:jar:${commons.configuration.version}</include> - <include>org.apache.hadoop:hadoop-common:jar:${hadoop-common.version}</include> - <include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop-common.version}</include> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-common-plus:jar:${hadoop.version}</include> <include>com.google.code.gson:gson</include> <include>org.eclipse.persistence:eclipselink</include> <include>org.eclipse.persistence:javax.persistence</include> @@ -88,8 +88,8 @@ <include>commons-logging:commons-logging</include> <include>com.google.guava:guava:jar:${google.guava.version}</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> + <include>org.apache.hadoop:hadoop-common:jar:${hadoop.version}</include> + <include>org.apache.hadoop:hadoop-auth:jar:${hadoop.version}</include> <include>org.apache.ranger:ranger-plugins-cred</include> <include>org.apache.ranger:credentialbuilder</include> </includes> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/ugsync/pom.xml ---------------------------------------------------------------------- diff --git a/ugsync/pom.xml b/ugsync/pom.xml index 63b3b68..792b41b 100644 --- a/ugsync/pom.xml +++ b/ugsync/pom.xml @@ -75,7 +75,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>${hadoop-auth.version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/unixauthclient/pom.xml ---------------------------------------------------------------------- diff --git a/unixauthclient/pom.xml b/unixauthclient/pom.xml index 3b4ef66..0116027 100644 --- a/unixauthclient/pom.xml +++ b/unixauthclient/pom.xml @@ -75,7 +75,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>${hadoop-auth.version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/f452c640/unixauthservice/pom.xml ---------------------------------------------------------------------- diff --git a/unixauthservice/pom.xml b/unixauthservice/pom.xml index a835201..f81d35c 100644 --- a/unixauthservice/pom.xml +++ b/unixauthservice/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> - <version>${hadoop-auth.version}</version> + <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId>
