From 0a77f8191069bd6898e641b993fc9a3b6acfa513 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Mon, 29 May 2023 10:35:26 +0800 Subject: [PATCH] Fix eclipse-jgit build failure in EBS --- jetty.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/jetty.spec b/jetty.spec index fd46985..91c7e6e 100644 --- a/jetty.spec +++ b/jetty.spec @@ -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 - 9.4.16-4 +- Fix eclipse-jgit build failure in EBS + * Wed Dec 28 2022 jiangpeng - 9.4.16-3 - Fix CVE-2022-2047 and CVE-2022-2048 -- Gitee