开源软件构建与测试

_service:tar_scm:picketbox.spec Changed

@@ -1,14 +1,12 @@
 %global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
 Name:                picketbox
-Version:             4.9.6
-Release:             2
+Version:             5.1.0
+Release:             1
 Summary:             Security framework for Java Applications
 License:             LGPLv2+
 URL:                 https://picketbox.jboss.org
-Source0:             https://github.com/picketbox/picketbox/archive/v%{namedversion}.tar.gz
-Source1:             picketbox-%{namedversion}-pom.xml
-Patch0:              picketbox-assembly.patch
+Source0:             https://github.com/%{name}/%{name}/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz
 BuildArch:           noarch
 BuildRequires:       maven-local mvn(javax.persistence:persistence-api)
 BuildRequires:       mvn(org.apache.maven.plugins:maven-assembly-plugin)
@@ -28,6 +26,9 @@
 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:       mvn(org.apache.maven.plugins:maven-shade-plugin)
+BuildRequires:       mvn(org.hibernate.javax.persistence:hibernate-jpa-2.1-api)
+BuildRequires:       mvn(org.hibernate:hibernate-core)
 BuildRequires:       java-11-openjdk-devel
 Requires:            java-11-openjdk
 Requires:            javapackages-tools
@@ -47,24 +48,15 @@
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
-%patch0 -p1
+%autosetup -n %{name}-%{namedversion}
 %pom_change_dep org.hibernate: ::3 security-jboss-sx/acl
-%pom_remove_dep "org.hibernate:hibernate-annotations" security-jboss-sx/acl/pom.xml
-%pom_change_dep :servlet-api org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec security-spi/spi
-%pom_change_dep :servlet-api org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.2.Final security-spi/parent
-%pom_xpath_inject "pom:pluginpom:artifactId='maven-jar-plugin'/pom:executions" "
-<execution>
-  <id>default-jar</id>
-  <phase>skip</phase>
-</execution>" security-jboss-sx/jbosssx-client
-%pom_remove_dep org.jboss.modules:jboss-modules security-jboss-sx/parent
-%pom_add_dep_mgmt org.jboss.modules:jboss-modules:1.3.4.Final:compile security-jboss-sx/parent
-%pom_xpath_set -r "pom:pluginpom:artifactId='maven-assembly-plugin'/pom:executions/pom:execution/pom:goals/pom:goaltext()='attached'" single
+%pom_remove_dep org.jboss.modules:jboss-modules 
+%pom_add_dep_mgmt org.jboss.modules:jboss-modules:1.3.6.Final:compile 
 %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
+sed -i 's/${version.javacc.plugin}/2.6/g' security-jboss-sx/jbosssx/pom.xml
 
 %build
 export JAVA_HOME=%{_jvmdir}/java-11-openjdk
@@ -74,15 +66,15 @@
 
 %install
 %mvn_install
-install -pm 644  assembly/target/picketbox-%{namedversion}-bin.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar
 
 %files -f .mfiles
 
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Thu Jan 25 2024 Ge Wang <wang__ge@126.com> - 5.1.0-1
+- Update to version 5.1.0
+
 * Tue Aug 01 2023 Ge Wang <wang__ge@126.com> - 4.9.6-2
 - Compile with jdk11 due to jboss-modules updated

_service:tar_scm:picketbox-assembly.patch Deleted

@@ -1,27 +0,0 @@
-diff -Naur picketbox.orig/assembly/bin.xml picketbox/assembly/bin.xml
---- picketbox.orig/assembly/bin.xml	2016-06-06 21:17:14.533587182 -0500
-+++ picketbox/assembly/bin.xml	2016-06-06 21:07:55.271125191 -0500
-@@ -1,4 +1,5 @@
- <assembly>
-+  <id>bin</id>
-   <formats>
-     <format>jar</format>
-   </formats>
-diff -Naur picketbox.orig/security-jboss-sx/assembly/src/assembly/bin.xml picketbox/security-jboss-sx/assembly/src/assembly/bin.xml
---- picketbox.orig/security-jboss-sx/assembly/src/assembly/bin.xml	2016-06-06 21:17:14.533587182 -0500
-+++ picketbox/security-jboss-sx/assembly/src/assembly/bin.xml	2016-06-06 21:09:32.613767054 -0500
-@@ -1,4 +1,5 @@
- <assembly>
-+  <id>bin</id>
-   <formats>
-     <format>jar</format>
-   </formats>
-diff -Naur picketbox.orig/security-spi/assembly/bin.xml picketbox/security-spi/assembly/bin.xml
---- picketbox.orig/security-spi/assembly/bin.xml	2016-06-06 21:17:14.533587182 -0500
-+++ picketbox/security-spi/assembly/bin.xml	2016-06-06 21:09:54.602754893 -0500
-@@ -1,4 +1,5 @@
- <assembly>
-+  <id>bin</id>
-   <formats>
-     <format>jar</format>
-   </formats>

_service Changed

_service:tar_scm:picketbox-4.9.6.Final-pom.xml Deleted

_service:tar_scm:picketbox-5.1.0.Final.tar.gz Added

_service:tar_scm:v4.9.6.Final.tar.gz Deleted

Changes of Revision 3