commit 18975ef7cce7b751c18b18f8c81933b63111a3d6 Author: gil puntogil@libero.it Date: Fri Jul 5 23:08:57 2013 +0200
switch to XMvn, rebuilt with jaxb2-maven-plugin support
bval.spec | 86 ++++++++++++++++++------------------------------------------ 1 files changed, 26 insertions(+), 60 deletions(-) --- diff --git a/bval.spec b/bval.spec index e77252c..dcd6661 100644 --- a/bval.spec +++ b/bval.spec @@ -4,22 +4,16 @@ %global with_guice 0 Name: bval Version: 0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Apache Bean Validation -Group: Development/Libraries License: ASL 2.0 Url: http://bval.apache.org/ Source0: http://www.apache.org/dist/%%7Bname%7D/%%7Bnamedversion%7D/%%7Bname%7D-paren... - Patch0: %{name}-0.3-incubating-core-FeaturesCapable.patch -# change org.codehaus.mojo jaxb2-maven-plugin with maven-jaxb22-plugin -# change org.apache.geronimo.specs geronimo-jpa_2.0_spec 1.1 with org.hibernate.javax.persistence hibernate-jpa-2.0-api 1.0.1.Final -Patch1: %{name}-0.4-jsr303-pom.patch # fix jaxb 2.2 apis -Patch2: %{name}-0.4-jsr303-fix-jaxb-apis.patch +Patch1: %{name}-0.4-jsr303-fix-jaxb-apis.patch
BuildRequires: java-devel >= 0:1.7.0 -BuildRequires: jpackage-utils
BuildRequires: apache-commons-beanutils BuildRequires: apache-commons-lang3 @@ -37,22 +31,8 @@ BuildRequires: xstream BuildRequires: aopalliance BuildRequires: atinject BuildRequires: google-guice -Requires: aopalliance -Requires: atinject -Requires: google-guice %endif
-Requires: apache-commons-beanutils -Requires: apache-commons-lang3 -Requires: bean-validation-api -Requires: freemarker -Requires: geronimo-validation -Requires: glassfish-jaxb -Requires: glassfish-jaxb-api -Requires: hibernate-jpa-2.0-api -Requires: slf4j -Requires: xstream - # test deps BuildRequires: geronimo-osgi-support BuildRequires: junit @@ -61,20 +41,12 @@ BuildRequires: mockito BuildRequires: apache-rat-plugin BuildRequires: buildnumber-maven-plugin BuildRequires: maven-antrun-plugin -BuildRequires: maven-compiler-plugin BuildRequires: maven-enforcer-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-jaxb2-plugin +BuildRequires: jaxb2-maven-plugin BuildRequires: maven-local BuildRequires: maven-plugin-bundle -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4
-Requires: java -Requires: jpackage-utils BuildArch: noarch
%description @@ -84,9 +56,7 @@ works on Java SE 5 or later. The initial codebase for the project was donated to the ASF by a SGA from Agimatec GmbH.
%package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils
%description javadoc This package contains javadoc for %{name}. @@ -98,7 +68,6 @@ find . -name "*.jar" -delete
%patch0 -p0 %patch1 -p0 -%patch2 -p0
# Don't use buildnumber-plugin, because jna is required and currently broken in f17 %pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin @@ -158,6 +127,15 @@ find . -name "*.jar" -delete <scope>test</scope> </dependency>' bval-jsr303
+%pom_remove_dep :geronimo-jpa_2.0_spec bval-jsr303 +%pom_xpath_inject "pom:project/pom:dependencies" ' + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> + <optional>true</optional> + </dependency>' bval-jsr303 + # unavailable deps # org.hibernate.jsr303.tck jsr303-tck 1.0.6.GA # org.jboss.test-harness jboss-test-harness-jboss-as-51 1.0.0 @@ -172,40 +150,28 @@ done
%build
-mvn-rpmbuild -Dri -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate - -%install +%mvn_file :%{name}-core %{name}/core +%mvn_file :%{name}-extras %{name}/extras +%mvn_file :%{name}-json %{name}/json +%mvn_file :%{name}-jsr303 %{name}/jsr303 +%mvn_file :%{name}-xstream %{name}/xstream
-mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom -%add_maven_depmap JPP.%{name}-parent.pom - -# bundle guice tck -mkdir -p %{buildroot}%{_javadir}/%{name} -for m in core \ - extras \ - json \ - jsr303 \ - xstream;do - install -m 644 %{name}-${m}/target/%{name}-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar - install -pm 644 %{name}-${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${m}.pom -%add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar -done +%mvn_build -- -Dri -Dproject.build.sourceEncoding=UTF-8
-mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} +%install +%mvn_install
-%files -%{_javadir}/%{name}/*.jar -%{_mavenpomdir}/JPP.%{name}-*.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc CHANGES.txt LICENSE NOTICE README.txt
-%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE
%changelog +* Fri Jul 05 2013 gil cattaneo puntogil@libero.it 0.5-5 +- switch to XMvn +- minor changes to adapt to current guideline + * Sun Feb 17 2013 gil cattaneo puntogil@libero.it 0.5-4 - added missing BR geronimo-parent-poms
java-sig-commits@lists.fedoraproject.org