Repository: sentry Updated Branches: refs/heads/master 85cf7f296 -> 2c37d8381
SENTRY-2366: Exclude jackson transitive dependencies (Sergio Pena, reviewed by Kalyan Kumar Kalvagadda) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/2c37d838 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/2c37d838 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/2c37d838 Branch: refs/heads/master Commit: 2c37d83816a38677ba5eb95faa6e97909851dc59 Parents: 85cf7f2 Author: Sergio Pena <[email protected]> Authored: Mon Aug 27 08:25:46 2018 -0500 Committer: Sergio Pena <[email protected]> Committed: Mon Aug 27 08:25:46 2018 -0500 ---------------------------------------------------------------------- pom.xml | 138 +++++++++++++++++++++- sentry-provider/sentry-provider-db/pom.xml | 5 + sentry-service/sentry-service-server/pom.xml | 6 + sentry-tests/sentry-tests-hive/pom.xml | 12 ++ 4 files changed, 160 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/2c37d838/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index dcf1076..fb9950d 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,9 @@ limitations under the License. <hadoop.version>2.7.5</hadoop.version> <hamcrest.version>1.3</hamcrest.version> <hive.version>2.3.3</hive.version> - <jackson.version>1.8.8</jackson.version> + <jackson.version>1.8.10</jackson.version> + <jackson-databind.version>2.2.3</jackson-databind.version> + <jackson-mapper-asl.version>1.8.10</jackson-mapper-asl.version> <jdo-api.version>3.0.1</jdo-api.version> <jetty.version>9.3.21.v20170918</jetty.version> <joda-time.version>2.5</joda-time.version> @@ -159,12 +161,22 @@ limitations under the License. <artifactId>curator-framework</artifactId> <groupId>org.apache.curator</groupId> </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -181,6 +193,10 @@ limitations under the License. <artifactId>curator-client</artifactId> <groupId>org.apache.curator</groupId> </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -192,11 +208,23 @@ limitations under the License. <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> @@ -217,16 +245,46 @@ limitations under the License. <groupId>org.apache.solr</groupId> <artifactId>solr-solrj</artifactId> <version>${solr.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> <version>${solr.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-test-framework</artifactId> <version>${solr.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>junit</groupId> @@ -296,12 +354,26 @@ limitations under the License. <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.servlet</artifactId> </exclusion> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-core</artifactId> <version>${hive.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> @@ -337,6 +409,14 @@ limitations under the License. <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-web</artifactId> </exclusion> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -406,6 +486,12 @@ limitations under the License. <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> <version>${hive.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hive</groupId> @@ -440,6 +526,14 @@ limitations under the License. <groupId>com.yammer.metrics</groupId> <artifactId>metrics-core</artifactId> </exclusion> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -459,6 +553,10 @@ limitations under the License. <groupId>com.yammer.metrics</groupId> <artifactId>metrics-core</artifactId> </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> </exclusions> </dependency> <dependency> @@ -622,6 +720,12 @@ limitations under the License. <groupId>org.apache.pig</groupId> <artifactId>pig</artifactId> <version>${pig.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.curator</groupId> @@ -632,6 +736,12 @@ limitations under the License. <groupId>org.apache.curator</groupId> <artifactId>curator-x-discovery</artifactId> <version>${curator.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.curator</groupId> @@ -647,6 +757,16 @@ limitations under the License. <groupId>org.apache.curator</groupId> <artifactId>curator-client</artifactId> <version>${curator.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> @@ -713,6 +833,12 @@ limitations under the License. <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.11</artifactId> <version>${kafka.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> @@ -723,6 +849,12 @@ limitations under the License. <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-servlets</artifactId> <version>${metrics.version}</version> + <exclusions> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> @@ -754,6 +886,10 @@ limitations under the License. <groupId>com.yammer.metrics</groupId> <artifactId>metrics-core</artifactId> </exclusion> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/sentry/blob/2c37d838/sentry-provider/sentry-provider-db/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/pom.xml b/sentry-provider/sentry-provider-db/pom.xml index bfe91d7..9f89ca3 100644 --- a/sentry-provider/sentry-provider-db/pom.xml +++ b/sentry-provider/sentry-provider-db/pom.xml @@ -180,6 +180,11 @@ limitations under the License. <version>${hive.version}</version> </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson-databind.version}</version> + </dependency> + <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/sentry/blob/2c37d838/sentry-service/sentry-service-server/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-service/sentry-service-server/pom.xml b/sentry-service/sentry-service-server/pom.xml index c835292..8315358 100644 --- a/sentry-service/sentry-service-server/pom.xml +++ b/sentry-service/sentry-service-server/pom.xml @@ -157,12 +157,18 @@ limitations under the License. </exclusions> </dependency> <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson-databind.version}</version> + </dependency> + <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> + <version>${jackson-mapper-asl.version}</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> http://git-wip-us.apache.org/repos/asf/sentry/blob/2c37d838/sentry-tests/sentry-tests-hive/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/pom.xml b/sentry-tests/sentry-tests-hive/pom.xml index c753acf..a167e76 100644 --- a/sentry-tests/sentry-tests-hive/pom.xml +++ b/sentry-tests/sentry-tests-hive/pom.xml @@ -224,6 +224,12 @@ limitations under the License. <artifactId>hadoop-yarn-common</artifactId> <version>${hadoop.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -333,6 +339,12 @@ limitations under the License. <artifactId>hadoop-aws</artifactId> <version>${hadoop.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + </exclusions> </dependency> </dependencies> <build>
