!16 手工同步pr15

From: @laokz 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

glassfish-hk2.spec

@@ -2,7 +2,7 @@
 %global extra_version 1.0.3
 Name:                glassfish-hk2
 Version:             2.5.0
-Release:             3
+Release:             4
 Summary:             Glassfish Hundred Kilobytes Kernel
 License:             EPL-2.0 or GPLv2 with exceptions
 URL:                 https://github.com/eclipse-ee4j/glassfish-hk2/
@@ -181,6 +181,9 @@ find . -name '*.jar' ! -name "gendir.jar" -type f -print -delete
 find . -name '*.class' -print -delete
 
 rm hk2-runlevel/src/test/java/org/glassfish/hk2/runlevel/tests/listener/ListenerErrorTest.java
+%if "%{_arch}" == "riscv64"
+rm hk2-locator/src/test/java/org/glassfish/hk2/tests/locator/multithreaded1/MultiThreaded1Test.java
+%endif
 
 %pom_remove_parent bom .
 %pom_change_dep -r jakarta.servlet:jakarta.servlet-api javax.servlet:javax.servlet-api
@@ -418,6 +421,9 @@ done
 %license LICENSE.md NOTICE.md
 
 %changelog
+* Tue Nov 14 2023 laokz <zhangkai@iscas.ac.cn> - 2.5.0-4
+- fix: remove very time-consuming MultiThreaded1Test for riscv64
+
 * Mon Aug 08 2022 herengui <herengui@uniontech.com> - 2.5.0-3
 - fix: build issue with jdk8u342(JDK-8132256)