rpms
/
hadoop
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix jetty version dependencies

This commit is contained in:
Mike Miller 2018-06-29 13:30:39 -04:00
parent cd7389bf2c
commit 7adcfbaf3f
2 changed files with 61 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
hadoop-fedora-integration.patch
View File

@ -43,7 +43,7 @@ diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/h
index b9d6c60..9330a1a 100644
--- a/hadoop-common-project/hadoop-auth/pom.xml
+++ b/hadoop-common-project/hadoop-auth/pom.xml
@@ -53,13 +53,9 @@
@@ -53,13 +53,8 @@
<scope>test</scope>
</dependency>
<dependency>
@ -56,7 +56,6 @@ index b9d6c60..9330a1a 100644
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>8.1.14.v20131031</version>
<scope>test</scope>
</dependency>
<dependency>
@ -115,7 +114,7 @@ diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project
index 7cf67a3..ef2733f 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -89,29 +89,34 @@
@@ -89,29 +89,25 @@
<scope>compile</scope>
</dependency>
<dependency>
@ -123,36 +122,29 @@ index 7cf67a3..ef2733f 100644
- <artifactId>servlet-api</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>8.1</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>8.1</version>
+ <artifactId>jetty-servlet</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>8.1</version>
+ <artifactId>jetty-webapp</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-sslengine</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>8.1</version>
<scope>compile</scope>
</dependency>
+
<dependency>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.tomcat</groupId>
@ -1404,7 +1396,7 @@ diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoo
index 420e5d2..c134d71 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -71,12 +71,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -70,15 +70,26 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>compile</scope>
</dependency>
<dependency>
@ -1420,6 +1412,20 @@ index 420e5d2..c134d71 100644
<artifactId>jetty-util</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util-ajax</artifactId>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
@@ -136,11 +131,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>compile</scope>
</dependency>
@ -1906,7 +1912,7 @@ index b315e2b..e9b072d 100644
<!-- define the Java language version used by the compiler -->
<javac.version>1.7</javac.version>
@@ -455,28 +455,22 @@
@@ -455,28 +455,27 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@ -1925,21 +1931,27 @@ index b315e2b..e9b072d 100644
- </exclusions>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>8</version>
+ <version>8.1</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.1.26</version>
+ <version>8</version>
+ <version>8.1</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-sslengine</artifactId>
- <artifactId>jetty-sslengine</artifactId>
- <version>6.1.26</version>
+ <version>8</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>8.1</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
@ -1981,19 +1993,18 @@ index b315e2b..e9b072d 100644
</dependency>
<dependency>
@@ -588,9 +582,9 @@
@@ -592,11 +592,6 @@
<version>2.4</version>
</dependency>
<dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-servlet-tester</artifactId>
- <version>6.1.26</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>test-jetty-servlet</artifactId>
+ <version>8</version>
</dependency>
- </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
diff --git a/hadoop-tools/hadoop-sls/pom.xml b/hadoop-tools/hadoop-sls/pom.xml
index 6166725..e0d3ee7 100644
--- a/hadoop-tools/hadoop-sls/pom.xml
@ -2313,7 +2324,7 @@ diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-serv
index 10f243c..af23544 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml
@@ -109,8 +105,9 @@
@@ -109,8 +105,8 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
@ -2321,7 +2332,6 @@ index 10f243c..af23544 100644
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>8</version>
</dependency>
<dependency>
@ -2495,3 +2505,18 @@ index 7ff2292..b6c9f6f 100644
ArrayList<String> nonSSLProtocols = new ArrayList<String>();
for (String p : engine.getEnabledProtocols()) {
if (!p.contains("SSLv3")) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
index 5ac65cc..d73721a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
@@ -40,6 +40,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
<dependency>
<groupId>org.apache.hadoop</groupId>

10
hadoop.spec
View File

@ -11,7 +11,7 @@
Name: hadoop
Version: 2.7.6
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A software platform for processing vast amounts of data
# The BSD license file is missing
# https://issues.apache.org/jira/browse/HADOOP-9849
@ -175,7 +175,6 @@ BuildRequires: systemd
BuildRequires: tomcat
BuildRequires: tomcat-el-3.0-api
BuildRequires: tomcat-log4j
BuildRequires: tomcat-servlet-3.1-api
BuildRequires: txw2
BuildRequires: xmlenc
BuildRequires: zookeeper-java > 3.4.5-15
@ -556,8 +555,6 @@ rm -rf hadoop-tools/hadoop-datajoin/src/test
# Add missing deps
%pom_add_dep org.iq80.leveldb:leveldb hadoop-hdfs-project/hadoop-hdfs
%pom_add_dep org.iq80.leveldb:leveldb hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common
%pom_add_dep org.eclipse.jetty:jetty-util-ajax hadoop-hdfs-project/hadoop-hdfs
%pom_add_dep org.eclipse.jetty:jetty-util-ajax hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager
# remove plugins that are not needed
%pom_remove_plugin :maven-jar-plugin hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy
@ -1130,7 +1127,10 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
%changelog
* Wed Jun 27 2018 Mike Miller <mmiller@apache.org> - 2.7.6-11
* Fri Jun 29 2018 Mike Miller <mmiller@apache.org> - 2.7.6-2
- Fix jetty version dependencies
* Wed Jun 27 2018 Mike Miller <mmiller@apache.org> - 2.7.6-1
- Upgrade to version 2.7.6
* Tue May 29 2018 Rafael dos Santos <rdossant@redhat.com> - 2.7.3-10