diff --git a/jetty.spec b/jetty.spec index 5301ac5e2a6e5499b68dbfebfc66c834a380bbc8..375ef95f8b226aa95a4516059cb95d704fa96993 100644 --- a/jetty.spec +++ b/jetty.spec @@ -12,7 +12,7 @@ %bcond_with jp_minimal Name: jetty Version: 9.4.16 -Release: 3 +Release: 4 Summary: Java Webserver and Servlet Container License: ASL 2.0 or EPL-1.0 or EPL-2.0 URL: http://www.eclipse.org/jetty/ @@ -29,14 +29,14 @@ Patch4: CVE-2021-34428.patch Patch5: CVE-2022-2047.patch Patch6: CVE-2022-2048.patch -BuildRequires: maven-local mvn(javax.servlet:javax.servlet-api) +BuildRequires: maven-local mvn(javax.servlet:javax.servlet-api) < 4.0.0 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) mvn(org.slf4j:slf4j-api) %if %{without jp_minimal} BuildRequires: maven-local mvn(com.github.jnr:jnr-unixsocket) BuildRequires: mvn(javax.annotation:javax.annotation-api) mvn(javax.enterprise:cdi-api) -BuildRequires: mvn(javax.servlet:javax.servlet-api) +BuildRequires: mvn(javax.servlet:javax.servlet-api) < 4.0.0 BuildRequires: mvn(javax.servlet.jsp:javax.servlet.jsp-api) mvn(javax.servlet:jstl) BuildRequires: mvn(javax.transaction:javax.transaction-api) BuildRequires: mvn(javax.websocket:javax.websocket-api) @@ -81,6 +81,7 @@ BuildRequires: glassfish-el systemd junit5 BuildRequires: jboss-websocket-1.0-api Requires: jboss-websocket-1.0-api Requires: java-1.8.0-openjdk-headless +Requires: glassfish-servlet-api < 4.0.0 %endif # without jp_minimal BuildArch: noarch %if %{without jp_minimal} @@ -192,6 +193,7 @@ Summary: jaas module for Jetty %package jsp Summary: jsp module for Jetty Requires: glassfish-el +Requires: glassfish-servlet-api < 4.0.0 %description jsp %{extdesc} %{summary}. @@ -202,6 +204,7 @@ Summary: security module for Jetty %package server Summary: server module for Jetty +Requires: glassfish-servlet-api < 4.0.0 %description server %{extdesc} %{summary}. @@ -268,6 +271,7 @@ Summary: FastCGI client module for Jetty %package fcgi-server Summary: FastCGI client module for Jetty +Requires: glassfish-servlet-api < 4.0.0 %description fcgi-server %{extdesc} %{summary}. @@ -308,6 +312,7 @@ Summary: proxy module for Jetty %package rewrite Summary: rewrite module for Jetty +Requires: glassfish-servlet-api < 4.0.0 %description rewrite %{extdesc} %{summary}. @@ -358,6 +363,7 @@ Summary: websocket-server module for Jetty %package websocket-servlet Summary: websocket-servlet module for Jetty +Requires: glassfish-servlet-api < 4.0.0 %description websocket-servlet %{extdesc} %{summary}. @@ -378,6 +384,7 @@ Summary: nosql module for Jetty %package httpservice Summary: httpservice module for Jetty +Requires: glassfish-servlet-api < 4.0.0 %description httpservice %{extdesc} %{summary}. @@ -393,6 +400,7 @@ Summary: osgi-boot-warurl module for Jetty %package osgi-boot-jsp Summary: osgi-boot-jsp module for Jetty +Requires: glassfish-servlet-api < 4.0.0 %description osgi-boot-jsp %{extdesc} %{summary}. @@ -788,6 +796,9 @@ exit 0 %license LICENSE NOTICE.txt LICENSE-MIT %changelog +* Tue Mar 14 2023 caodongxia - 9.4.16-4 +- Fix self-compilation failure + * Wed Mar 01 2023 Ge Wang - 9.4.16-3 - Fix EBS build failure due to jetty-util version mismatch