From cb9213799aaf3574fb7f7af1be87c7985b57141c Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Mon, 21 Aug 2023 20:22:41 +0800 Subject: [PATCH] Fix build failure caused by jboss-classfilewriter upgrade to 1.3.0 --- undertow.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/undertow.spec b/undertow.spec index f1f6480..9cd92c9 100644 --- a/undertow.spec +++ b/undertow.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: undertow Version: 1.4.0 -Release: 6 +Release: 7 Summary: Java web server using non-blocking IO License: ASL 2.0 URL: http://undertow.io/ @@ -25,6 +25,9 @@ BuildRequires: mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1 BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec) BuildRequires: mvn(org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec) BuildRequires: mvn(org.jboss.xnio:xnio-api) mvn(org.jboss.xnio:xnio-nio) +BuildRequires: java-11-openjdk-devel +Requires: java-11-openjdk +Requires: javapackages-tools %description Java web server using non-blocking IO @@ -46,6 +49,7 @@ rm -rf mac-jdk-fix rm -rf servlet/src/test/java/io/undertow/servlet/test/proprietry/TransferTestCase.java %pom_disable_module examples +%pom_add_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final core %pom_remove_plugin -r :maven-checkstyle-plugin %pom_remove_plugin org.bitstrings.maven.plugins:dependencypath-maven-plugin core %pom_remove_plugin org.bitstrings.maven.plugins:dependencypath-maven-plugin servlet @@ -59,6 +63,9 @@ for p in core servlet;do done %build +export JAVA_HOME=%{_jvmdir}/java-11-openjdk +export CFLAGS="${RPM_OPT_FLAGS}" +export CXXFLAGS="${RPM_OPT_FLAGS}" %mvn_build -f %install @@ -72,6 +79,9 @@ done %license LICENSE.txt %changelog +* Mon Aug 21 2023 yaoxin - 1:1.4.0-7 +- Fix build failure caused by jboss-classfilewriter upgrade to 1.3.0 + * Tue Jun 13 2023 liyanan - 1:1.4.0-6 - Delete TransferTestCase.java TestCase -- Gitee