msimacek pushed to jetty8 (master). "Use jboss-servlet-3.0-api as tomcat no longer provides 3.0"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Mar 30 13:30:31 UTC 2015


>From 794476b7583673a5b59b1d3b8708da2d001f0f1c Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek at redhat.com>
Date: Mon, 30 Mar 2015 15:20:49 +0200
Subject: Use jboss-servlet-3.0-api as tomcat no longer provides 3.0


diff --git a/jetty8.spec b/jetty8.spec
index 53b2049..580f264 100644
--- a/jetty8.spec
+++ b/jetty8.spec
@@ -5,7 +5,7 @@
 
 Name:           jetty8
 Version:        8.1.14
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Java Webserver and Servlet Container
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
 # some MIT-licensed code (from Utf8Appendable) is used too
@@ -32,7 +32,8 @@ BuildRequires:  maven-release-plugin
 BuildRequires:  maven-remote-resources-plugin
 BuildRequires:  maven-source-plugin
 BuildRequires:  slf4j
-BuildRequires:  tomcat-servlet-3.0-api
+BuildRequires:  jboss-servlet-3.0-api
+BuildRequires:  maven-site-plugin
 
 %description
 Jetty is a 100% Java HTTP Server and Servlet Container. This means that you
@@ -59,6 +60,8 @@ find -name "*.class" -delete
 
 %mvn_compat_version : 8.1.14.v20131031
 
+%pom_change_dep -r org.eclipse.jetty.orbit:javax.servlet org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec
+
 # Disable unneeded modules. This is a compat package and only a
 # minimal set of modules are being built.
 %pom_xpath_remove "pom:modules"
@@ -94,6 +97,9 @@ mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,}
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Mon Mar 30 2015 Michael Simacek <msimacek at redhat.com> - 8.1.14-9
+- Use jboss-servlet-3.0-api as tomcat no longer provides 3.0
+
 * Mon Jul 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.14-8
 - Don't generate OSGi provides
 - Resolves: rhbz#1079675
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/jetty8.git/commit/?h=master&id=794476b7583673a5b59b1d3b8708da2d001f0f1c


More information about the scm-commits mailing list