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

Fix eclipse-jgit build failure in EBS

Browse Source 
(cherry picked from commit 0a77f8191069bd6898e641b993fc9a3b6acfa513)
This commit is contained in:
starlet-dx 2023-05-29 10:35:26 +08:00 committed by openeuler-sync-bot
parent 624ae5728e
commit 286c201e5e
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
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,7 +29,7 @@ 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)
@ -37,7 +37,7 @@ BuildRequires: jetty-util
%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)
@ -82,6 +82,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}
@ -193,6 +194,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}.
@ -203,6 +205,7 @@ Summary: security module for Jetty
%package server
Summary: server module for Jetty
Requires: glassfish-servlet-api < 4.0.0
%description server
%{extdesc} %{summary}.
@ -269,6 +272,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}.
@ -309,6 +313,7 @@ Summary: proxy module for Jetty
%package rewrite
Summary: rewrite module for Jetty
Requires: glassfish-servlet-api < 4.0.0
%description rewrite
%{extdesc} %{summary}.
@ -359,6 +364,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}.
@ -379,6 +385,7 @@ Summary: nosql module for Jetty
%package httpservice
Summary: httpservice module for Jetty
Requires: glassfish-servlet-api < 4.0.0
%description httpservice
%{extdesc} %{summary}.
@ -394,6 +401,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
* Mon May 29 2023 yaoxin <yao_xin001@hoperun.com> - 9.4.16-4
- Fix eclipse-jgit build failure in EBS
* Wed Dec 28 2022 jiangpeng <jiangpeng01@ncti-gba.cn> - 9.4.16-3
- Fix CVE-2022-2047 and CVE-2022-2048