Repository: sentry Updated Branches: refs/heads/sentry-ha-redesign 6df0a66d7 -> cb0f10036
SENTRY-1532: Sentry Web UI isn't working (Alexander Kolbasov via Vamsee Yarlagadda, Reviewed by: Vamsee Yarlagadda, Mat Crocker, Hao Hao) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/cb0f1003 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/cb0f1003 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/cb0f1003 Branch: refs/heads/sentry-ha-redesign Commit: cb0f1003600b3101918f11863d830f985b63cee5 Parents: 6df0a66 Author: Vamsee Yarlagadda <[email protected]> Authored: Wed Jan 11 18:27:45 2017 -0800 Committer: Vamsee Yarlagadda <[email protected]> Committed: Wed Jan 11 18:27:45 2017 -0800 ---------------------------------------------------------------------- sentry-provider/sentry-provider-db/pom.xml | 10 ++++++++++ sentry-tests/sentry-tests-solr/pom.xml | 10 ++++++++++ 2 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/cb0f1003/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 2451f34..d504a88 100644 --- a/sentry-provider/sentry-provider-db/pom.xml +++ b/sentry-provider/sentry-provider-db/pom.xml @@ -182,6 +182,16 @@ limitations under the License. </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jettyVersion}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>${jettyVersion}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/sentry/blob/cb0f1003/sentry-tests/sentry-tests-solr/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-solr/pom.xml b/sentry-tests/sentry-tests-solr/pom.xml index 2f802ab..de9f04f 100644 --- a/sentry-tests/sentry-tests-solr/pom.xml +++ b/sentry-tests/sentry-tests-solr/pom.xml @@ -52,6 +52,16 @@ limitations under the License. <groupId>org.apache.solr</groupId> <artifactId>solr-solrj</artifactId> </dependency> + <!-- + Solr is using old Jetty 6.1.26 and Sentry is using more recent Jetty. + Since the test combines Solr and Sentry in the same JVM, here we need to specify + dependency on Jetty 6.1.26, otherwise Solr e2e tests tests are not working properly. + --> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>6.1.26</version> + </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId>
