Repository: ambari Updated Branches: refs/heads/branch-2.5 d4044f214 -> e8dc1e755
AMBARI-20170 : ambari views : excluded the aws bundled jar from transitive dependency of hadoop-aws and included explicitly only in files view (nitirajrathore) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8dc1e75 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8dc1e75 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8dc1e75 Branch: refs/heads/branch-2.5 Commit: e8dc1e755e18a1b676376b4a982f6fca65b2947a Parents: d4044f2 Author: Nitiraj Singh Rathore <[email protected]> Authored: Fri Feb 24 20:27:37 2017 +0530 Committer: Nitiraj Singh Rathore <[email protected]> Committed: Fri Feb 24 20:28:11 2017 +0530 ---------------------------------------------------------------------- contrib/views/files/pom.xml | 16 +++++++++++++++- contrib/views/pom.xml | 2 -- contrib/views/utils/pom.xml | 9 ++++----- 3 files changed, 19 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e8dc1e75/contrib/views/files/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml index 410ed1e..663615a 100644 --- a/contrib/views/files/pom.xml +++ b/contrib/views/files/pom.xml @@ -27,10 +27,24 @@ <artifactId>ambari-contrib-views</artifactId> <version>2.5.0.0.0</version> </parent> - <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-aws</artifactId> + <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> <exclusions> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8dc1e75/contrib/views/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml index dda956f..d0a09dd 100644 --- a/contrib/views/pom.xml +++ b/contrib/views/pom.xml @@ -32,7 +32,6 @@ <ambari.version>2.5.0.0.0</ambari.version> <ambari.dir>${project.parent.parent.basedir}</ambari.dir> <hadoop.version>2.7.3</hadoop.version> - <aws-java-sdk.version>1.10.6</aws-java-sdk.version> <views.jars.dir>views-jars</views.jars.dir> <views.jars.dir.rel>../target/${views.jars.dir}</views.jars.dir.rel> </properties> @@ -187,7 +186,6 @@ <artifactId>httpcore</artifactId> <version>4.4</version> </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> http://git-wip-us.apache.org/repos/asf/ambari/blob/e8dc1e75/contrib/views/utils/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml index 324fb1a..edb1a02 100644 --- a/contrib/views/utils/pom.xml +++ b/contrib/views/utils/pom.xml @@ -36,6 +36,10 @@ <exclusions> <exclusion> <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-bundle</artifactId> + </exclusion> + <exclusion> + <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk</artifactId> </exclusion> <exclusion> @@ -49,11 +53,6 @@ </exclusions> </dependency> <dependency> - <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-s3</artifactId> - <version>${aws-java-sdk.version}</version> - </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version>
