Repository: sentry Updated Branches: refs/heads/master 297088b57 -> b165c6914
SENTRY-2072: log4j2 dependencies brought by Hive 2 are causing conflicts with Sentry log4j (Kalyan Kumar Kalvagadda reviewed by Sergio Pena and Lina Li) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/b165c691 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/b165c691 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/b165c691 Branch: refs/heads/master Commit: b165c691431ae85c8cec149fea74ca72375d65ca Parents: 297088b Author: Kalyan Kumar Kalvagadda <[email protected]> Authored: Tue Nov 28 07:19:50 2017 -0600 Committer: Sergio Pena <[email protected]> Committed: Thu Nov 30 16:37:59 2017 -0600 ---------------------------------------------------------------------- pom.xml | 86 +++++++++++++++++++++++++++++ sentry-tests/sentry-tests-hive/pom.xml | 6 ++ 2 files changed, 92 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/b165c691/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index dd408d8..948f88c 100644 --- a/pom.xml +++ b/pom.xml @@ -271,6 +271,26 @@ limitations under the License. <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-web</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -292,6 +312,26 @@ limitations under the License. <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-web</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -330,6 +370,32 @@ limitations under the License. <groupId>org.apache.hive</groupId> <artifactId>hive-shims</artifactId> <version>${hive.version}</version> + <exclusions> + <exclusion> + <artifactId>apache-curator</artifactId> + <groupId>org.apache.curator</groupId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-web</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hive</groupId> @@ -345,6 +411,26 @@ limitations under the License. <artifactId>apache-curator</artifactId> <groupId>org.apache.curator</groupId> </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-web</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/sentry/blob/b165c691/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 ddd1e01..11b7917 100644 --- a/sentry-tests/sentry-tests-hive/pom.xml +++ b/sentry-tests/sentry-tests-hive/pom.xml @@ -53,6 +53,12 @@ limitations under the License. <artifactId>derby</artifactId> </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.6.2</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> <scope>test</scope>
