Repository: ambari Updated Branches: refs/heads/branch-2.5 255d1890a -> d65a776a7
AMBARI-20226 : reverted exclusions of jars from views other than files as it is not required now (nitirajrathore) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d65a776a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d65a776a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d65a776a Branch: refs/heads/branch-2.5 Commit: d65a776a7c257cc2f8007d7f2e84791e4e29962e Parents: 255d189 Author: Nitiraj Singh Rathore <[email protected]> Authored: Tue Feb 28 15:06:01 2017 +0530 Committer: Nitiraj Singh Rathore <[email protected]> Committed: Tue Feb 28 15:07:52 2017 +0530 ---------------------------------------------------------------------- contrib/views/commons/pom.xml | 12 -------- contrib/views/hive-next/pom.xml | 28 ++++------------- contrib/views/hive20/pom.xml | 60 +++++++++++++----------------------- contrib/views/pig/pom.xml | 26 +++++----------- contrib/views/utils/pom.xml | 42 ++++++++----------------- contrib/views/wfmanager/pom.xml | 12 -------- 6 files changed, 46 insertions(+), 134 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d65a776a/contrib/views/commons/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/commons/pom.xml b/contrib/views/commons/pom.xml index fb4deea..4b7ee3a 100644 --- a/contrib/views/commons/pom.xml +++ b/contrib/views/commons/pom.xml @@ -53,14 +53,6 @@ <groupId>tomcat</groupId> <artifactId>jasper-runtime</artifactId> </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> </exclusions> </dependency> @@ -73,10 +65,6 @@ <groupId>tomcat</groupId> <artifactId>jasper-runtime</artifactId> </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/ambari/blob/d65a776a/contrib/views/hive-next/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/hive-next/pom.xml b/contrib/views/hive-next/pom.xml index cd26d5e..fd85a50 100644 --- a/contrib/views/hive-next/pom.xml +++ b/contrib/views/hive-next/pom.xml @@ -104,20 +104,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -132,10 +124,6 @@ <groupId>tomcat</groupId> <artifactId>jasper-compiler</artifactId> </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -168,10 +156,6 @@ <artifactId>jasper-runtime</artifactId> </exclusion> <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - <exclusion> <groupId>tomcat</groupId> <artifactId>jasper-compiler</artifactId> </exclusion> http://git-wip-us.apache.org/repos/asf/ambari/blob/d65a776a/contrib/views/hive20/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/pom.xml b/contrib/views/hive20/pom.xml index fe85a35..0d97bbd 100644 --- a/contrib/views/hive20/pom.xml +++ b/contrib/views/hive20/pom.xml @@ -105,20 +105,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -133,10 +125,6 @@ <groupId>tomcat</groupId> <artifactId>jasper-compiler</artifactId> </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -160,6 +148,21 @@ <version>2.0</version> </dependency> <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-jdbc</artifactId> + <version>${hive-version}</version> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>1.2</version> @@ -173,8 +176,6 @@ <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> <version>0.9.0</version> - <exclusions> - </exclusions> </dependency> <dependency> <groupId>junit</groupId> @@ -204,25 +205,6 @@ <version>2.5.0.0.0</version> </dependency> <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-jdbc</artifactId> - <version>${hive-version}</version> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>commons-validator</groupId> <artifactId>commons-validator</artifactId> <version>1.4.0</version> http://git-wip-us.apache.org/repos/asf/ambari/blob/d65a776a/contrib/views/pig/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml index f99b2bb..d7d2de9 100644 --- a/contrib/views/pig/pom.xml +++ b/contrib/views/pig/pom.xml @@ -87,34 +87,22 @@ <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> + <exclusion> <groupId>tomcat</groupId> <artifactId>jasper-runtime</artifactId> </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>javax.ws.rs</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/d65a776a/contrib/views/utils/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml index edb1a02..d8dc6ec 100644 --- a/contrib/views/utils/pom.xml +++ b/contrib/views/utils/pom.xml @@ -56,35 +56,23 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -177,12 +165,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-azure</artifactId> <version>${hadoop.version}</version> - <exclusions> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>commons-validator</groupId> http://git-wip-us.apache.org/repos/asf/ambari/blob/d65a776a/contrib/views/wfmanager/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/pom.xml b/contrib/views/wfmanager/pom.xml index a659de1..6d0776b 100644 --- a/contrib/views/wfmanager/pom.xml +++ b/contrib/views/wfmanager/pom.xml @@ -89,10 +89,6 @@ <groupId>tomcat</groupId> <artifactId>jasper-runtime</artifactId> </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -101,17 +97,9 @@ <version>${hadoop.version}</version> <exclusions> <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </exclusion> - <exclusion> <groupId>tomcat</groupId> <artifactId>jasper-runtime</artifactId> </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> </exclusions> </dependency>
