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

!66 [sync] PR-65: Fix eclipse-jgit build failure in EBS

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-05-30 02:27:19 +00:00 committed by Gitee
commit 3ed91ef1cb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
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,7 +29,7 @@ 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)
@ -37,7 +37,7 @@ BuildRequires: jetty-util
%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)
@ -82,6 +82,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}
@ -193,6 +194,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}.
@ -203,6 +205,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}.
@ -269,6 +272,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}.
@ -309,6 +313,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}.
@ -359,6 +364,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}.
@ -379,6 +385,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}.
@ -394,6 +401,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
* 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 * Wed Dec 28 2022 jiangpeng <jiangpeng01@ncti-gba.cn> - 9.4.16-3
- Fix CVE-2022-2047 and CVE-2022-2048 - Fix CVE-2022-2047 and CVE-2022-2048