From f37cba1acf19e304a4bdaecdd8b9cdcda6eae791 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Thu, 3 Aug 2023 15:38:55 +0800 Subject: [PATCH] Compile with jdk11 due to jboss-modules updated --- picketbox.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/picketbox.spec b/picketbox.spec index b5a95ed..5d028d7 100644 --- a/picketbox.spec +++ b/picketbox.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: picketbox Version: 4.9.6 -Release: 1 +Release: 2 Summary: Security framework for Java Applications License: LGPLv2+ URL: https://picketbox.jboss.org @@ -26,6 +26,12 @@ BuildRequires: mvn(org.jboss.spec.javax.security.auth.message:jboss-jaspi- BuildRequires: mvn(org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.5_spec) BuildRequires: mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec) BuildRequires: mvn(org.picketbox:picketbox-commons) xmvn +BuildRequires: mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec) +BuildRequires: mvn(javax.xml.bind:jaxb-api) +BuildRequires: java-11-openjdk-devel +Requires: java-11-openjdk +Requires: javapackages-tools + %description Java Security Framework that provides Java developers the following functionality: @@ -57,8 +63,13 @@ This package contains the API documentation for %{name}. %pom_xpath_set -r "pom:plugin[pom:artifactId='maven-assembly-plugin']/pom:executions/pom:execution/pom:goals/pom:goal[text()='attached']" single %pom_remove_dep org.picketbox:common-spi security-jboss-sx/identity %pom_add_dep org.picketbox:common-spi:'${project.version}':compile security-jboss-sx/identity +%pom_add_dep org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final security-spi/common +%pom_add_dep javax.xml.bind:jaxb-api:2.2.12-b141001.1542 security-jboss-sx/jbosssx %build +export JAVA_HOME=%{_jvmdir}/java-11-openjdk +export CFLAGS="${RPM_OPT_FLAGS}" +export CXXFLAGS="${RPM_OPT_FLAGS}" %mvn_build -f %install @@ -72,5 +83,8 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.po %files javadoc -f .mfiles-javadoc %changelog +* Tue Aug 01 2023 Ge Wang - 4.9.6-2 +- Compile with jdk11 due to jboss-modules updated + * Thu Aug 13 2020 zhanghua - 4.9.6-1 - package init