[bval] update to 0.5
gil
gil at fedoraproject.org
Mon Sep 24 23:02:37 UTC 2012
commit b2f4fdeda169bd9cf4bdb01468a6b03e6f920968
Author: gil <puntogil at libero.it>
Date: Tue Sep 25 01:02:05 2012 +0200
update to 0.5
.gitignore | 1 +
bval.spec | 100 +++++++++++++++++++++++++++++++++++++++++------------------
sources | 2 +-
3 files changed, 71 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1828978..e274708 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/bval-parent-0.4-source-release.zip
+/bval-parent-0.5-source-release.zip
diff --git a/bval.spec b/bval.spec
index 62508ca..1702678 100644
--- a/bval.spec
+++ b/bval.spec
@@ -3,36 +3,20 @@
# disable guice module for now
%global with_guice 0
Name: bval
-Version: 0.4
-Release: 3%{?dist}
+Version: 0.5
+Release: 1%{?dist}
Summary: Apache Bean Validation
Group: Development/Libraries
License: ASL 2.0
Url: http://bval.apache.org/
Source0: http://www.apache.org/dist/%{name}/%{namedversion}/%{name}-parent-%{namedversion}-source-release.zip
-# remove
-# findbugs-maven-plugin
-# ianal-maven-plugin
-# jdepend-maven-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
-Patch0: %{name}-%{namedversion}-parent-pom.patch
-Patch1: %{name}-0.3-incubating-core-FeaturesCapable.patch
+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
-Patch2: %{name}-%{namedversion}-jsr303-pom.patch
+Patch1: %{name}-0.4-jsr303-pom.patch
# fix jaxb 2.2 apis
-Patch3: %{name}-%{namedversion}-jsr303-fix-jaxb-apis.patch
-
-# replace bundle with core and jsr303
-Patch4: %{name}-%{namedversion}-guice-pom.patch
-# build failure bval-guice/src/main/java/org/apache/bval/guice/ValidationModule.java:[61,12] error: cannot find symbol
-Patch5: %{name}-%{namedversion}-disable-guice.patch
-
-# replace bundle with core and jsr303
-Patch6: %{name}-%{namedversion}-extras-pom.patch
-# fix koji build problems missing org.apache.geronimo.osgi.locator.ProviderLocator
-Patch7: %{name}-%{namedversion}-jsr303-osgi-locator.patch
+Patch2: %{name}-0.4-jsr303-fix-jaxb-apis.patch
BuildRequires: java-devel >= 0:1.7.0
BuildRequires: jpackage-utils
@@ -113,21 +97,71 @@ find . -name "*.jar" -delete
%patch0 -p0
%patch1 -p0
%patch2 -p0
-%patch3 -p0
+
+# Don't use buildnumber-plugin, because jna is required and currently broken in f17
+%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
+
+%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin bval-xstream
+%pom_remove_plugin org.codehaus.mojo:ianal-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:jdepend-maven-plugin
+
+
+%pom_remove_dep org.apache.geronimo.specs:geronimo-jpa_2.0_spec
+%pom_xpath_inject "pom:project/pom:dependencyManagement/pom:dependencies" "
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.0.1.Final</version>
+ </dependency>"
+
%if %with_guice
-%patch4 -p0
+# require guice with aop support
+# build failure bval-guice/src/main/java/org/apache/bval/guice/ValidationModule.java:[61,12] error: cannot find symbol
+%pom_remove_dep org.apache.bval:org.apache.bval.bundle bval-guice
+%pom_xpath_inject "pom:project/pom:dependencies" '
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ <version>${project.version}</version>
+ </dependency>' bval-guice
%else
-%patch5 -p0
+%pom_disable_module bval-guice
%endif
-%patch6 -p0
-%patch7 -p0
+%pom_remove_dep org.apache.bval:org.apache.bval.bundle bval-extras
+%pom_xpath_inject "pom:project/pom:dependencies" '
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>' bval-extras
+%pom_xpath_inject "pom:project/pom:dependencies" '
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ <version>${project.version}</version>
+ </dependency>' bval-extras
+
+# fix koji build problems missing org.apache.geronimo.osgi.locator.ProviderLocator
+%pom_xpath_inject "pom:project/pom:dependencies" '
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-osgi-locator</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </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
-sed -i "s|<module>bval-tck</module>|<!--module>bval-tck</module-->|" pom.xml
+%pom_disable_module bval-tck
-sed -i "s|<module>bundle</module>|<!--module>bundle</module-->|" pom.xml
+%pom_disable_module bundle
# fix non ASCII chars
for s in bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java;do
@@ -151,9 +185,9 @@ for m in core \
json \
jsr303 \
xstream;do
- install -m 644 bval-${m}/target/bval-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar
- install -pm 644 bval-${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${m}.pom
- %add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar
+ 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
mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -170,6 +204,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE NOTICE
%changelog
+* Mon Sep 24 2012 gil cattaneo <puntogil at libero.it> 0.5-1
+- update to 0.5
+- used pom macros
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 8c263e4..abb239c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d5eae2cfacd9a988ff041985d9bbcbe bval-parent-0.4-source-release.zip
+528f0c81ae074560f42788b4baad7ff0 bval-parent-0.5-source-release.zip
More information about the scm-commits
mailing list