From 7adcfbaf3fab619c697300cbe70f0b0afb7e5b01 Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Fri, 29 Jun 2018 13:30:39 -0400 Subject: [PATCH] Fix jetty version dependencies --- hadoop-fedora-integration.patch | 87 +++++++++++++++++++++------------ hadoop.spec | 10 ++-- 2 files changed, 61 insertions(+), 36 deletions(-) diff --git a/hadoop-fedora-integration.patch b/hadoop-fedora-integration.patch index bd08050..01d207c 100644 --- a/hadoop-fedora-integration.patch +++ b/hadoop-fedora-integration.patch @@ -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 @@ test @@ -56,7 +56,6 @@ index b9d6c60..9330a1a 100644 - jetty + org.eclipse.jetty + jetty-servlet -+ 8.1.14.v20131031 test @@ -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 @@ compile @@ -123,36 +122,29 @@ index 7cf67a3..ef2733f 100644 - servlet-api + org.eclipse.jetty + jetty-server -+ 8.1 compile - org.mortbay.jetty - jetty + org.eclipse.jetty -+ jetty-util -+ 8.1 ++ jetty-servlet compile - org.mortbay.jetty - jetty-util + org.eclipse.jetty -+ jetty-servlet -+ 8.1 ++ jetty-webapp compile -- + - org.mortbay.jetty - jetty-sslengine -+ org.eclipse.jetty -+ jetty-webapp -+ 8.1 - compile - -+ - +- compile +- +- - javax.servlet.jsp - jsp-api + org.apache.tomcat @@ -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"> compile @@ -1420,6 +1412,20 @@ index 420e5d2..c134d71 100644 jetty-util compile ++ ++ org.eclipse.jetty ++ jetty-util-ajax ++ compile ++ ++ ++ org.eclipse.jetty ++ jetty-util ++ ++ ++ + + com.sun.jersey + jersey-core @@ -136,11 +131,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> compile @@ -1906,7 +1912,7 @@ index b315e2b..e9b072d 100644 1.7 -@@ -455,28 +455,22 @@ +@@ -455,28 +455,27 @@ javax.servlet servlet-api @@ -1925,21 +1931,27 @@ index b315e2b..e9b072d 100644 - + org.eclipse.jetty + jetty-server -+ 8 ++ 8.1 - org.mortbay.jetty ++ org.eclipse.jetty ++ jetty-servlet ++ 8.1 ++ ++ + org.eclipse.jetty jetty-util - 6.1.26 -+ 8 ++ 8.1 - org.mortbay.jetty -+ org.eclipse.jetty - jetty-sslengine +- jetty-sslengine - 6.1.26 -+ 8 ++ org.eclipse.jetty ++ jetty-webapp ++ 8.1 org.apache.tomcat.embed @@ -1981,19 +1993,18 @@ index b315e2b..e9b072d 100644 -@@ -588,9 +582,9 @@ +@@ -592,11 +592,6 @@ + 2.4 - +- - org.mortbay.jetty - jetty-servlet-tester - 6.1.26 -+ org.eclipse.jetty -+ test-jetty-servlet -+ 8 - +- commons-logging + commons-logging 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 @@ commons-logging @@ -2321,7 +2332,6 @@ index 10f243c..af23544 100644 - jetty + org.eclipse.jetty + jetty-server -+ 8 @@ -2495,3 +2505,18 @@ index 7ff2292..b6c9f6f 100644 ArrayList nonSSLProtocols = new ArrayList(); 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 @@ + javax.servlet + servlet-api + ++ ++ org.eclipse.jetty ++ jetty-util ++ + + + org.apache.hadoop diff --git a/hadoop.spec b/hadoop.spec index 8e4c433..96a1d54 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -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 - 2.7.6-11 +* Fri Jun 29 2018 Mike Miller - 2.7.6-2 +- Fix jetty version dependencies + +* Wed Jun 27 2018 Mike Miller - 2.7.6-1 - Upgrade to version 2.7.6 * Tue May 29 2018 Rafael dos Santos - 2.7.3-10