You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2021/09/28 07:26:59 UTC
[bigtop] branch branch-3.0 updated: BIGTOP-3584. Fix build failure
of Ambari due to missing dependency on javax.el. (#817)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 4e37a86 BIGTOP-3584. Fix build failure of Ambari due to missing dependency on javax.el. (#817)
4e37a86 is described below
commit 4e37a869985783951e75dbb67a3223eced54ef56
Author: Masatake Iwasaki <iw...@apache.org>
AuthorDate: Tue Sep 28 14:01:56 2021 +0900
BIGTOP-3584. Fix build failure of Ambari due to missing dependency on javax.el. (#817)
(cherry picked from commit bfbfbc4a064d698e5708d462f4dbb9db5f58d5e3)
---
.../ambari/patch7-exclude-glassfish-javax.diff | 52 ++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/bigtop-packages/src/common/ambari/patch7-exclude-glassfish-javax.diff b/bigtop-packages/src/common/ambari/patch7-exclude-glassfish-javax.diff
new file mode 100644
index 0000000..e9e8401
--- /dev/null
+++ b/bigtop-packages/src/common/ambari/patch7-exclude-glassfish-javax.diff
@@ -0,0 +1,52 @@
+diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+index 95f9cac..f8e3449 100644
+--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
++++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+@@ -368,6 +368,14 @@
+ <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ </exclusion>
++ <exclusion>
++ <groupId>org.glassfish</groupId>
++ <artifactId>javax.el</artifactId>
++ </exclusion>
++ <exclusion>
++ <groupId>org.glassfish.web</groupId>
++ <artifactId>javax.servlet.jsp</artifactId>
++ </exclusion>
+ </exclusions>
+ </dependency>
+
+@@ -760,6 +768,10 @@
+ <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ </exclusion>
++ <exclusion>
++ <groupId>org.glassfish</groupId>
++ <artifactId>javax.el</artifactId>
++ </exclusion>
+ </exclusions>
+ <version>${phoenix.version}</version>
+ <scope>test</scope>
+@@ -782,6 +794,10 @@
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
++ <exclusion>
++ <groupId>org.glassfish</groupId>
++ <artifactId>javax.el</artifactId>
++ </exclusion>
+ </exclusions>
+ <classifier>tests</classifier>
+ </dependency>
+@@ -804,6 +820,10 @@
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
++ <exclusion>
++ <groupId>org.glassfish</groupId>
++ <artifactId>javax.el</artifactId>
++ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>