[picketbox] Upstream release 4.0.18.Final
Marek Goldmann
goldmann at fedoraproject.org
Thu Jul 25 11:04:46 UTC 2013
commit 746d748a25349aef00c37cda84824566833114b2
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Thu Jul 25 13:04:28 2013 +0200
Upstream release 4.0.18.Final
.gitignore | 1 +
....patch => picketbox-4.0.18.Final-assembly.patch | 0
...final-pom.xml => picketbox-4.0.18.Final-pom.xml | 2 +-
picketbox-4.0.6.final-pom.patch | 143 ----
picketbox-4.0.6.final-ugly.patch | 780 --------------------
picketbox.spec | 129 +---
sources | 2 +-
7 files changed, 34 insertions(+), 1023 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32172c1..1d9ae02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/picketbox-4.0.6.final.tar.xz
+/picketbox-4.0.18.Final.tar.xz
diff --git a/picketbox-4.0.6.final-assembly.patch b/picketbox-4.0.18.Final-assembly.patch
similarity index 100%
rename from picketbox-4.0.6.final-assembly.patch
rename to picketbox-4.0.18.Final-assembly.patch
diff --git a/picketbox-4.0.6.final-pom.xml b/picketbox-4.0.18.Final-pom.xml
similarity index 90%
rename from picketbox-4.0.6.final-pom.xml
rename to picketbox-4.0.18.Final-pom.xml
index 5c64409..a8e6856 100644
--- a/picketbox-4.0.6.final-pom.xml
+++ b/picketbox-4.0.18.Final-pom.xml
@@ -2,6 +2,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.picketbox</groupId>
<artifactId>picketbox</artifactId>
- <version>4.0.6.final</version>
+ <version>4.0.18.Final</version>
</project>
diff --git a/picketbox.spec b/picketbox.spec
index 9675bb4..a9458f6 100644
--- a/picketbox.spec
+++ b/picketbox.spec
@@ -1,28 +1,27 @@
-%global namedreltag .final
+%global namedreltag .Final
%global namedversion %{version}%{?namedreltag}
Name: picketbox
-Version: 4.0.6
-Release: 9%{?dist}
+Version: 4.0.18
+Release: 1%{?dist}
Summary: Security framework for Java Applications
-Group: Development/Libraries
License: LGPLv2+
URL: http://www.jboss.org/picketbox
-# svn export http://anonsvn.jboss.org/repos/picketbox/tags/4.0.6.final/ picketbox-4.0.6.final
-# tar cafJ picketbox-4.0.6.final.tar.xz picketbox-4.0.6.final
-Source0: %{name}-%{namedversion}.tar.xz
-Source1: %{name}-%{namedversion}-pom.xml
+# svn export http://anonsvn.jboss.org/repos/picketbox/tags/4.0.18.Final/ picketbox-4.0.18.Final
+# tar cafJ picketbox-4.0.18.Final.tar.xz picketbox-4.0.18.Final
+Source0: picketbox-%{namedversion}.tar.xz
+Source1: picketbox-%{namedversion}-pom.xml
-Patch0: %{name}-%{namedversion}-assembly.patch
-Patch1: %{name}-%{namedversion}-pom.patch
-# REMOVE THIS! (at some point)
-Patch2: %{name}-%{namedversion}-ugly.patch
+Patch0: picketbox-%{namedversion}-assembly.patch
BuildArch: noarch
BuildRequires: concurrent
BuildRequires: hibernate-jpa-2.0-api >= 1.0.1-5
+BuildRequires: hibernate3
+BuildRequires: hibernate3-entitymanager
+BuildRequires: hibernate-commons-annotations
BuildRequires: hsqldb
BuildRequires: infinispan
BuildRequires: javacc-maven-plugin
@@ -32,9 +31,10 @@ BuildRequires: jboss-jacc-1.4-api
BuildRequires: jboss-jaspi-1.0-api
BuildRequires: jboss-parent
BuildRequires: jboss-servlet-3.0-api
+BuildRequires: geronimo-jpa
BuildRequires: jboss-transaction-1.1-api
-BuildRequires: jpackage-utils
BuildRequires: maven-local
+BuildRequires: jboss-logging-tools
BuildRequires: maven-compiler-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-injection-plugin
@@ -48,21 +48,6 @@ BuildRequires: picketbox-commons
BuildRequires: picketbox-xacml
BuildRequires: rhq-plugin-annotations
-Requires: concurrent
-Requires: hibernate-jpa-2.0-api >= 1.0.1-5
-Requires: hsqldb
-Requires: infinispan
-Requires: java
-Requires: jboss-connector-1.6-api
-Requires: jboss-jacc-1.4-api
-Requires: jboss-jaspi-1.0-api
-Requires: jboss-servlet-3.0-api
-Requires: jboss-transaction-1.1-api
-Requires: jpackage-utils
-Requires: picketbox
-Requires: picketbox-xacml
-Requires: rhq-plugin-annotations
-
%description
Java Security Framework that provides Java developers the following
functionality:
@@ -75,92 +60,40 @@ functionality:
%package javadoc
Summary: Javadocs for %{name}
-Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{namedversion}
+%setup -q -n picketbox-%{namedversion}
+
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+
+# Change hibernate version
+sed -i 's|3.6.6.Final|3|g' security-jboss-sx/acl/pom.xml
+
+%pom_remove_dep "org.hibernate:hibernate-annotations" security-jboss-sx/acl/pom.xml
%build
-# Because of ugly patch
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+%mvn_build -f
%install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install
-# JAR
+# Assembly jar
install -pm 644 assembly/target/picketbox-%{namedversion}-bin.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
-install -pm 644 picketbox/target/picketbox-bare-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/bare.jar
-
-install -pm 644 security-spi/acl/target/acl-spi-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/security-spi-acl.jar
-install -pm 644 security-spi/identity/target/identity-spi-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/security-spi-identity.jar
-install -pm 644 security-spi/authorization/target/authorization-spi-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/security-spi-authorization.jar
-install -pm 644 security-spi/spi/target/picketbox-spi-bare-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/spi-bare.jar
-install -pm 644 picketbox-infinispan/target/picketbox-infinispan-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/infinispan.jar
-
-install -pm 644 security-jboss-sx/acl/target/picketbox-acl-impl-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/acl-impl.jar
-install -pm 644 security-jboss-sx/identity/target/picketbox-identity-impl-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/identity-impl.jar
-install -pm 644 security-jboss-sx/jbosssx-client/target/jbosssx-client-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jbosssx-client.jar
-install -pm 644 security-jboss-sx/jbosssx/target/jbosssx-bare.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/jbosssx-bare.jar
-
-# POM
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-install -pm 644 parent/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-parent.pom
-install -pm 644 security-spi/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-security-spi-parent.pom
-install -pm 644 security-spi/parent/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-security-spi-parent-parent.pom
-install -pm 644 security-jboss-sx/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-impl-parent.pom
-install -pm 644 security-jboss-sx/parent/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-impl-parent-parent.pom
-install -pm 644 picketbox-infinispan/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-infinispan.pom
-
-install -pm 644 picketbox/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-bare.pom
-install -pm 644 security-spi/acl/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-security-spi-acl.pom
-install -pm 644 security-spi/identity/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-security-spi-identity.pom
-install -pm 644 security-spi/authorization/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-security-spi-authorization.pom
-install -pm 644 security-spi/spi/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-spi-bare.pom
-install -pm 644 security-jboss-sx/acl/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-acl-impl.pom
-install -pm 644 security-jboss-sx/identity/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-identity-impl.pom
-install -pm 644 security-jboss-sx/jbosssx/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jbosssx-bare.pom
-install -pm 644 security-jboss-sx/jbosssx-client/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jbosssx-client.pom
-
-# DEPMAP
%add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar
-%add_maven_depmap JPP.%{name}-parent.pom
-%add_maven_depmap JPP.%{name}-security-spi-parent.pom
-%add_maven_depmap JPP.%{name}-security-spi-parent-parent.pom
-%add_maven_depmap JPP.%{name}-impl-parent.pom
-%add_maven_depmap JPP.%{name}-impl-parent-parent.pom
-
-%add_maven_depmap JPP.%{name}-bare.pom %{name}/bare.jar
-%add_maven_depmap JPP.%{name}-security-spi-acl.pom %{name}/security-spi-acl.jar
-%add_maven_depmap JPP.%{name}-security-spi-identity.pom %{name}/security-spi-identity.jar
-%add_maven_depmap JPP.%{name}-security-spi-authorization.pom %{name}/security-spi-authorization.jar
-%add_maven_depmap JPP.%{name}-spi-bare.pom %{name}/spi-bare.jar
-%add_maven_depmap JPP.%{name}-acl-impl.pom %{name}/acl-impl.jar
-%add_maven_depmap JPP.%{name}-identity-impl.pom %{name}/identity-impl.jar
-%add_maven_depmap JPP.%{name}-jbosssx-bare.pom %{name}/jbosssx-bare.jar
-%add_maven_depmap JPP.%{name}-jbosssx-client.pom %{name}/jbosssx-client.jar
-%add_maven_depmap JPP.%{name}-infinispan.pom %{name}/infinispan.jar
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+
+%files javadoc -f .mfiles-javadoc
%changelog
+* Tue Jul 09 2013 Marek Goldmann <mgoldman at redhat.com> - 4.0.18-1
+- Upstream release 4.0.18.Final
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index efa947c..5fbd0d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f85cd21a421341d67298b3907bd7cb1 picketbox-4.0.6.final.tar.xz
+4cbbd2e25189ddc85582cb542d35f106 picketbox-4.0.18.Final.tar.xz
More information about the scm-commits
mailing list