Repository: sentry Updated Branches: refs/heads/master 2a89d2bfe -> aba45daf7
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/aba45daf Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/aba45daf Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/aba45daf Branch: refs/heads/master Commit: aba45daf7825abad87e27d66284a32f3f3e37cc0 Parents: 2a89d2b Author: Vamsee Yarlagadda <[email protected]> Authored: Wed Jan 11 18:30:08 2017 -0800 Committer: Vamsee Yarlagadda <[email protected]> Committed: Wed Jan 11 18:30:08 2017 -0800 ---------------------------------------------------------------------- sentry-service/sentry-service-server/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/aba45daf/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 97bd326..ff4cdb1 100644 --- a/sentry-service/sentry-service-server/pom.xml +++ b/sentry-service/sentry-service-server/pom.xml @@ -112,6 +112,16 @@ limitations under the License. <artifactId>jetty-servlet</artifactId> </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.apache.hive</groupId> <artifactId>hive-beeline</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/sentry/blob/aba45daf/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 a60b4ee..156d6bd 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>
