packages/jetty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix self-compilation failure

Browse Source 
(cherry picked from commit 01cebaa4790d779ad55c0bbf45cdeed5ba34efcc)
This commit is contained in:
caodongxia 2023-03-14 20:16:47 +08:00 committed by openeuler-sync-bot
parent 66da52e888
commit 7c6ccd3b52
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty.spec
View File

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