!75 [sync] PR-74: License compliance rectification

From: @openeuler-sync-bot 
Reviewed-by: @DingliZhang 
Signed-off-by: @DingliZhang
This commit is contained in:
openeuler-ci-bot 2024-07-26 06:11:10 +00:00 committed by Gitee
commit 80b7a73ace
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -12,9 +12,9 @@
%bcond_with jp_minimal %bcond_with jp_minimal
Name: jetty Name: jetty
Version: 9.4.16 Version: 9.4.16
Release: 5 Release: 6
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: Apache-2.0 OR EPL-1.0
URL: http://www.eclipse.org/jetty/ URL: http://www.eclipse.org/jetty/
Source0: https://github.com/eclipse/%{name}.project/archive/%{name}-%{version}%{addver}.tar.gz Source0: https://github.com/eclipse/%{name}.project/archive/%{name}-%{version}%{addver}.tar.gz
Source1: jetty.sh Source1: jetty.sh
@ -215,7 +215,7 @@ Summary: servlet module for Jetty
%package util %package util
Summary: util module for Jetty Summary: util module for Jetty
License: (ASL 2.0 or EPL) and MIT License: (Apache-2.0 OR EPL-1.0) AND MIT
%description util %description util
%{extdesc} %{summary}. %{extdesc} %{summary}.
@ -457,7 +457,7 @@ Summary: jstl module for Jetty
%package javadoc %package javadoc
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
License: (ASL 2.0 or EPL) and MIT License: (Apache-2.0 OR EPL-1.0) AND MIT
%description javadoc %description javadoc
%{summary}. %{summary}.
@ -796,6 +796,9 @@ exit 0
%license LICENSE NOTICE.txt LICENSE-MIT %license LICENSE NOTICE.txt LICENSE-MIT
%changelog %changelog
* Thu Jul 18 2024 yaoxin <yao_xin001@hoperun.com> - 9.4.16-6
- License compliance rectification
* Mon Jan 29 2024 xu_ping <707078654@qq.com> - 9.4.16-5 * Mon Jan 29 2024 xu_ping <707078654@qq.com> - 9.4.16-5
- Fix build failure due to upgrade jetty-artifact-remote-resources - Fix build failure due to upgrade jetty-artifact-remote-resources