From 9efc5773604d6d6e09c9453a70f3626cdc9e7350 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Thu, 3 Aug 2023 16:06:46 +0800 Subject: [PATCH] Compile with jdk11 due to jboss-modules updated --- wildfly-core.spec | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/wildfly-core.spec b/wildfly-core.spec index 7723a31..6155112 100644 --- a/wildfly-core.spec +++ b/wildfly-core.spec @@ -3,7 +3,7 @@ %global namedversion %{version}%{?namedreltag} Name: wildfly-core Version: 2.2.0 -Release: 3 +Release: 4 Summary: The core run-time of WildFly License: ASL 2.0 and BSD and LGPLv2+ URL: http://wildfly.org/ @@ -67,6 +67,10 @@ BuildRequires: mvn(org.jboss.shrinkwrap:shrinkwrap-impl-base) mvn(org.mock BuildRequires: mvn(org.slf4j:jcl-over-slf4j) mvn(org.syslog4j:syslog4j) BuildRequires: mvn(org.wildfly.legacy.test:wildfly-legacy-spi) %endif +BuildRequires: mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec) +BuildRequires: java-11-openjdk-devel +Requires: java-11-openjdk +Requires: javapackages-tools Provides: bundled(apache-common-codec) = 1.7 BuildArch: noarch %description @@ -113,9 +117,16 @@ cp -p core-feature-pack/src/main/resources/content/LICENSE.txt . %mvn_package ":wildfly-core-build:zip::" __noinstall %mvn_package ":wildfly-core-build:::" __noinstall +%pom_add_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final protocol +%pom_add_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final core-security/implementation +%pom_add_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final version +%pom_add_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final launcher + %build -%mvn_build -f -- -X -rm target/site/apidocs/javadoc.sh +export JAVA_HOME=%{_jvmdir}/java-11-openjdk +export CFLAGS="${RPM_OPT_FLAGS}" +export CXXFLAGS="${RPM_OPT_FLAGS}" +%mvn_build -f -j -- -X %install %mvn_install @@ -124,13 +135,16 @@ rm target/site/apidocs/javadoc.sh %doc README.md %license LICENSE.txt -%files javadoc -f .mfiles-javadoc +%files javadoc %license LICENSE.txt %files feature-pack -f .mfiles-core-feature-pack %license LICENSE.txt %changelog +* Tue Aug 01 2023 Ge Wang - 2.2.0-4 +- Compile with jdk11 due to jboss-modules updated + * Fri Dec 24 2021 wangkai - 2.2.0-3 - This package depends on log4j.After the log4j vulnerability CVE-2021-45105 is fixed,the version needs to be rebuild. -- Gitee