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 - 8.1.14-9 +- Use jboss-servlet-3.0-api as tomcat no longer provides 3.0 + * Mon Jul 21 2014 Mikolaj Izdebski - 8.1.14-8 - Don't generate OSGi provides - Resolves: rhbz#1079675