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

!63 [sync] PR-61: Fix EBS build failure due to dependency version mismatch

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-03-16 01:48:34 +00:00 committed by Gitee
commit 66da52e888
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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: 2 Release: 3
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/
@ -507,6 +507,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_disable_module jetty-alpn-conscrypt-client jetty-alpn %pom_disable_module jetty-alpn-conscrypt-client jetty-alpn
%pom_remove_dep -r :jetty-alpn-conscrypt-server %pom_remove_dep -r :jetty-alpn-conscrypt-server
%pom_remove_dep -r :jetty-alpn-conscrypt-client %pom_remove_dep -r :jetty-alpn-conscrypt-client
sed -i 's|9.3.0.RC0|${project.version}|g' tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
cp %{SOURCE6} . cp %{SOURCE6} .
sed -i '/<SystemProperty name="jetty.state"/d' \ sed -i '/<SystemProperty name="jetty.state"/d' \
@ -787,6 +788,9 @@ exit 0
%license LICENSE NOTICE.txt LICENSE-MIT %license LICENSE NOTICE.txt LICENSE-MIT
%changelog %changelog
* Wed Mar 01 2023 Ge Wang <wangge20@h-partners.com> - 9.4.16-3
- Fix EBS build failure due to jetty-util version mismatch
* Wed Dec 28 2022 jiangpeng <jiangpeng01@ncti-gba.cn> - 9.4.16-2 * Wed Dec 28 2022 jiangpeng <jiangpeng01@ncti-gba.cn> - 9.4.16-2
- Fix CVE-2022-2047 and CVE-2022-2048 - Fix CVE-2022-2047 and CVE-2022-2048