diff --git a/jetty.spec b/jetty.spec index ff0c82b..51578c6 100644 --- a/jetty.spec +++ b/jetty.spec @@ -50,7 +50,7 @@ Name: jetty Version: 9.4.18 -Release: 1%{addver}%{?dist} +Release: 2%{addver}%{?dist} Summary: Java Webserver and Servlet Container # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt @@ -106,15 +106,12 @@ BuildRequires: mvn(org.apache.taglibs:taglibs-standard-spec) BuildRequires: mvn(org.apache.tomcat:tomcat-jasper) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) -BuildRequires: mvn(org.eclipse.equinox.http:servlet) BuildRequires: mvn(org.eclipse.jetty.alpn:alpn-api) BuildRequires: mvn(org.eclipse.jetty.orbit:javax.mail.glassfish) BuildRequires: mvn(org.eclipse.jetty.orbit:javax.security.auth.message) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-assembly-descriptors) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-schemas) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-helper) -BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi) -BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi.services) BuildRequires: mvn(org.jboss.weld.servlet:weld-servlet-core) BuildRequires: mvn(org.mongodb:mongo-java-driver) BuildRequires: mvn(org.ow2.asm:asm) @@ -184,11 +181,6 @@ Requires: %{name}-websocket-servlet = %{version}-%{release} Requires: %{name}-javax-websocket-client-impl = %{version}-%{release} Requires: %{name}-javax-websocket-server-impl = %{version}-%{release} Requires: %{name}-nosql = %{version}-%{release} -Requires: %{name}-httpservice = %{version}-%{release} -Requires: %{name}-osgi-boot = %{version}-%{release} -Requires: %{name}-osgi-boot-warurl = %{version}-%{release} -Requires: %{name}-osgi-boot-jsp = %{version}-%{release} -Requires: %{name}-osgi-alpn = %{version}-%{release} Requires: %{name}-quickstart = %{version}-%{release} Requires: %{name}-jstl = %{version}-%{release} Requires: %{name}-alpn-client = %{version}-%{release} @@ -213,6 +205,11 @@ Obsoletes: %{name}-monitor < 9.4.0-0.4 Obsoletes: %{name}-hazelcast < 9.4.18-1 # Infinispan in Fedora is too old for jetty to build against (Added in F31) Obsoletes: %{name}-infinispan < 9.4.18-1 +# Eclipse no longer available (Added in F31) +Obsoletes: %{name}-osgi-alpn < 9.4.18-1 +Obsoletes: %{name}-osgi-boot < 9.4.18-1 +Obsoletes: %{name}-osgi-boot-jsp < 9.4.18-1 +Obsoletes: %{name}-osgi-boot-warurl < 9.4.18-1 %description %global desc \ @@ -288,6 +285,8 @@ Summary: server module for Jetty %package servlet Summary: servlet module for Jetty +# Eclipse no longer available (Added in F31) +Obsoletes: %{name}-httpservice < 9.4.18-1 %description servlet %{extdesc} %{summary}. @@ -487,36 +486,6 @@ Summary: nosql module for Jetty %description nosql %{extdesc} %{summary}. -%package httpservice -Summary: httpservice module for Jetty - -%description httpservice -%{extdesc} %{summary}. - -%package osgi-boot -Summary: osgi-boot module for Jetty - -%description osgi-boot -%{extdesc} %{summary}. - -%package osgi-boot-warurl -Summary: osgi-boot-warurl module for Jetty - -%description osgi-boot-warurl -%{extdesc} %{summary}. - -%package osgi-boot-jsp -Summary: osgi-boot-jsp module for Jetty - -%description osgi-boot-jsp -%{extdesc} %{summary}. - -%package osgi-alpn -Summary: osgi-alpn module for Jetty - -%description osgi-alpn -%{extdesc} %{summary}. - %package quickstart Summary: quickstart module for Jetty @@ -618,6 +587,9 @@ find . -name "*.class" -exec rm {} \; %pom_add_dep 'org.junit.jupiter:junit-jupiter-engine:${junit.version}' tests/test-sessions/test-sessions-common +# Old version of jetty not available for tests, so use this version +%pom_change_dep 'org.eclipse.jetty:jetty-util' 'org.eclipse.jetty:jetty-util:${project.version}' tests/test-webapps/test-servlet-spec/test-spec-webapp + # provided by glassfish-jsp-api that has newer version %pom_change_dep -r javax.servlet.jsp:jsp-api javax.servlet.jsp:javax.servlet.jsp-api @@ -634,8 +606,8 @@ sed -i '/^\s*\*.*