[libspring-webflow-2.0-java] 01/03: Fixed a compilation error with Spring Framework 3.1

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/2.0.9.RELEASE-6
in repository libspring-webflow-2.0-java.

commit 10dcd156560aca701767a33506ffecc40e30993c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 3 10:55:12 2014 +0100

    Fixed a compilation error with Spring Framework 3.1
---
 debian/changelog              |  7 +++++++
 debian/patches/series         |  1 +
 debian/patches/spring_31.diff | 15 +++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2205c82..bdbdd4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libspring-webflow-2.0-java (2.0.9.RELEASE-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed a compilation error with Spring Framework 3.1
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Dec 2014 10:45:31 +0100
+
 libspring-webflow-2.0-java (2.0.9.RELEASE-5) unstable; urgency=low
 
   * Team upload
diff --git a/debian/patches/series b/debian/patches/series
index f129745..996a86e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 ognl.diff
 spring_30.diff
 drop-backport-util-concurrent.diff
+spring_31.diff
diff --git a/debian/patches/spring_31.diff b/debian/patches/spring_31.diff
new file mode 100644
index 0000000..c1a05d0
--- /dev/null
+++ b/debian/patches/spring_31.diff
@@ -0,0 +1,15 @@
+Description: Spring 3.1 compatibility
+Origin: backport, https://github.com/spring-projects/spring-webflow/commit/dddcf7a
+--- a/projects/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/BindingModel.java
++++ b/projects/spring-webflow/src/main/java/org/springframework/webflow/mvc/view/BindingModel.java
+@@ -226,6 +226,10 @@
+ 		throw new UnsupportedOperationException("Should not be called during view rendering");
+ 	}
+ 
++	public String[] resolveMessageCodes(String errorCode) {
++		throw new UnsupportedOperationException("Should not be called during view rendering");
++	}
++
+ 	// internal helpers
+ 
+ 	private Expression parseFieldExpression(String field) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-webflow-2.0-java.git