You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by jo...@apache.org on 2021/04/09 22:47:10 UTC
[impala] branch master updated: IMPALA-10643: Allow the inclusion
of jetty-client
This is an automated email from the ASF dual-hosted git repository.
joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new 1dcd596 IMPALA-10643: Allow the inclusion of jetty-client
1dcd596 is described below
commit 1dcd59638c340e2e1d167f7e8b21019e897893a9
Author: Fang-Yu Rao <fa...@cloudera.com>
AuthorDate: Wed Apr 7 20:43:39 2021 -0700
IMPALA-10643: Allow the inclusion of jetty-client
We excluded all artifacts under the group of org.eclipse.jetty for
ranger-plugins-audit when bumping up CDP_BUILD_NUMBER to 4493826, which
is too stringent in that the artifact of jetty-client is actually
required by ranger-plugins-audit. Excluding jetty-client would thus
result in a NoClassDefFoundError at runtime. This patch removes the
block that excluded all artifacts of org.eclipse.jetty when the
dependency of ranger-plugins-audit is added, which allows
ranger-plugins-audit to pull in jetty-client, which in turn pulls in
jetty-http and jetty-io. In this regard, we also add these three
artifacts as allowed dependencies because all artifacts under
org.eclipse.jetty are banned in the section of bannedDependencies.
Testing:
- Verified in a local development environment that Impala could build
and that jetty-client-9.4.31.v20200723.jar is indeed on the class
path in fe/target/build-classpath.txt.
Change-Id: I9087b7e6866f1500c66f42a74b3f8619e82c3bda
Reviewed-on: http://gerrit.cloudera.org:8080/17287
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
fe/pom.xml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/fe/pom.xml b/fe/pom.xml
index 73be13c..1fdd1cf 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -140,10 +140,10 @@ under the License.
<groupId>org.apache.solr</groupId>
<artifactId>*</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
+ <!--
+ We do not explicitly exclude all artifacts in org.eclipse.jetty because
+ jetty-client is needed.
+ -->
<!-- Exclude json-smart to pin the version -->
<exclusion>
<groupId>net.minidev</groupId>
@@ -835,6 +835,10 @@ under the License.
<exclude>org.apache.orc:*</exclude>
</excludes>
<includes>
+ <!-- ranger-plugins-audit depends on jetty-client, which in turn pulls in jetty-http and jetty-io. -->
+ <include>org.eclipse.jetty:jetty-client</include>
+ <include>org.eclipse.jetty:jetty-http</include>
+ <include>org.eclipse.jetty:jetty-io</include>
<!-- hadoop-yarn-common depends on some Jetty utilities. -->
<include>org.eclipse.jetty:jetty-util</include>
<!-- Include the allowed versions specifically -->