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