开源软件构建与测试

Changes of Revision 10

_service:tar_scm:picketbox.spec Changed

@@ -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.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 @@
 %pom_xpath_set -r "pom:pluginpom:artifactId='maven-assembly-plugin'/pom:executions/pom:execution/pom:goals/pom:goaltext()='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 @@
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Aug 01 2023 Ge Wang <wang__ge@126.com> - 4.9.6-2
+- Compile with jdk11 due to jboss-modules updated
+
 * Thu Aug 13 2020 zhanghua <zhanghua40@huawei.com> - 4.9.6-1
 - package init