[bval] fix java8 build

gil gil at fedoraproject.org
Thu Jun 19 13:09:07 UTC 2014


commit ffa80491a34a40208430a14918a0033e415ab35d
Author: gil <puntogil at libero.it>
Date:   Thu Jun 19 15:08:54 2014 +0200

    fix java8 build

 bval-0.5-java8.patch |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 bval.spec            |    4 +++
 2 files changed, 60 insertions(+), 0 deletions(-)
---
diff --git a/bval-0.5-java8.patch b/bval-0.5-java8.patch
new file mode 100644
index 0000000..7545838
--- /dev/null
+++ b/bval-0.5-java8.patch
@@ -0,0 +1,56 @@
+diff -Nru bval-parent-0.5/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java bval-parent-0.5-gil/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java
+--- bval-parent-0.5/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java	2012-09-18 08:30:14.000000000 +0200
++++ bval-parent-0.5-gil/bval-jsr303/src/main/java/org/apache/bval/jsr303/ConstraintValidation.java	2014-06-11 19:02:11.000000000 +0200
+@@ -138,7 +138,7 @@
+      * {@inheritDoc}
+      */
+     public <L extends ValidationListener> void validate(ValidationContext<L> context) {
+-        validate((GroupValidationContext<?>) context);
++        validateGroupContext((GroupValidationContext<?>) context);
+     }
+ 
+     /**
+@@ -147,7 +147,7 @@
+      * @param context
+      *            root
+      */
+-    public void validate(GroupValidationContext<?> context) {
++    public void validateGroupContext(GroupValidationContext<?> context) {
+         context.setConstraintValidation(this);
+         /**
+          * execute unless the given validation constraint has already been
+diff -Nru bval-parent-0.5/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodValidatorImpl.java bval-parent-0.5-gil/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodValidatorImpl.java
+--- bval-parent-0.5/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodValidatorImpl.java	2012-09-18 08:30:14.000000000 +0200
++++ bval-parent-0.5-gil/bval-jsr303/src/main/java/org/apache/bval/jsr303/extensions/MethodValidatorImpl.java	2014-06-11 19:07:14.000000000 +0200
+@@ -206,13 +206,13 @@
+             // 1. process groups
+             for (Group current : groups.getGroups()) {
+                 context.setCurrentGroup(current);
+-                validation.validate(context);
++                validation.validateGroupContext(context);
+             }
+             // 2. process sequences
+             for (List<Group> eachSeq : groups.getSequences()) {
+                 for (Group current : eachSeq) {
+                     context.setCurrentGroup(current);
+-                    validation.validate(context);
++                    validation.validateGroupContext(context);
+                     /**
+                      * if one of the group process in the sequence leads to one
+                      * or more validation failure, the groups following in the
+@@ -263,13 +263,13 @@
+             // 1. process groups
+             for (Group current : groups.getGroups()) {
+                 context.setCurrentGroup(current);
+-                validation.validate(context);
++                validation.validateGroupContext(context);
+             }
+             // 2. process sequences
+             for (List<Group> eachSeq : groups.getSequences()) {
+                 for (Group current : eachSeq) {
+                     context.setCurrentGroup(current);
+-                    validation.validate(context);
++                    validation.validateGroupContext(context);
+                     /**
+                      * if one of the group process in the sequence leads to one
+                      * or more validation failure, the groups following in the
diff --git a/bval.spec b/bval.spec
index a9b55cb..68c3ef7 100644
--- a/bval.spec
+++ b/bval.spec
@@ -14,6 +14,8 @@ Source1:       %{name}-0.5-depmap
 Patch0:        %{name}-0.3-incubating-core-FeaturesCapable.patch
 # fix jaxb 2.2 apis
 Patch1:        %{name}-0.4-jsr303-fix-jaxb-apis.patch
+# https://issues.apache.org/jira/browse/BVAL-127
+Patch2:        bval-0.5-java8.patch
 
 BuildRequires: java-devel >= 0:1.7.0
 
@@ -73,6 +75,7 @@ find . -name "*.jar" -delete
 
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
 
 # Don't use buildnumber-plugin, because jna is required and currently broken in f17
 %pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
@@ -81,6 +84,7 @@ find . -name "*.jar" -delete
 %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_plugin :maven-source-plugin
 
 
 %pom_remove_dep org.apache.geronimo.specs:geronimo-jpa_2.0_spec


More information about the scm-commits mailing list