[amplab-tachyon/f21] update jetty dependency

Huamin Chen hchen at fedoraproject.org
Fri Sep 5 21:26:38 UTC 2014


commit 49d611439e38f17467b83cbccee56d9e7305a44a
Author: Huamin Chen <hchen at redhat.com>
Date:   Fri Sep 5 17:26:30 2014 -0400

    update jetty dependency
    
    Signed-off-by: Huamin Chen <hchen at redhat.com>

 amplab-tachyon.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/amplab-tachyon.spec b/amplab-tachyon.spec
index 87b63fd..9ec7c04 100644
--- a/amplab-tachyon.spec
+++ b/amplab-tachyon.spec
@@ -49,6 +49,10 @@ BuildRequires: mvn(org.powermock:powermock-module-junit4)
 BuildRequires: mvn(org.powermock:powermock-api-mockito)
 BuildRequires: mvn(org.apache.hadoop.fs.glusterfs:glusterfs-hadoop)
 BuildRequires: mvn(org.eclipse.jetty:jetty-jsp)
+BuildRequires: mvn(org.eclipse.jetty:jetty-webapp)
+BuildRequires: mvn(org.eclipse.jetty:jetty-server)
+BuildRequires: mvn(org.eclipse.jetty:jetty-servlets)
+BuildRequires: mvn(org.eclipse.jetty:jetty-util)
 
 # Test deps
 BuildRequires: mvn(junit:junit)
@@ -61,6 +65,7 @@ BuildRequires: maven-site-plugin
 BuildRequires: replacer
 BuildRequires: thrift
 BuildRequires: systemd
+BuildRequires: maven-shade-plugin
 
 BuildArch:     noarch
 
@@ -92,7 +97,7 @@ find -name '*.jar' -print -delete
 %patch0 -F2 -p1
 %patch1 -F2 -p1
 
-sed -i "s|<artifactId>hadoop-client|<artifactId>hadoop-mapreduce-client-core|" pom.xml
+sed -i "s|<artifactId>hadoop-client|<artifactId>hadoop-mapreduce-client-core|" core/pom.xml
 
 %pom_xpath_remove "pom:repositories"
 
@@ -102,6 +107,7 @@ sed -i "s|<artifactId>hadoop-client|<artifactId>hadoop-mapreduce-client-core|" p
 # Fix unavailable jetty-jsp-2.1
 #%pom_remove_dep org.eclipse.jetty:jetty-jsp
 %pom_add_dep org.glassfish.web:javax.servlet.jsp::compile
+%pom_add_dep org.eclipse.jetty:jetty-util
 
 #make additions for hadoop2
 %pom_add_dep org.apache.hadoop:hadoop-common


More information about the scm-commits mailing list