jmock2 version 2.5.1+dfsg-1 failed to build with openjdk-7

During a rebuild test on precise with default-jdk switched to openjdk-7, a build failure was detected for jmock2 version 2.5.1+dfsg-1.

See attached log for full build failure details.

This log snippet might also be of interest:

    [javac] ^
    [javac] where T is a type-variable:
    [javac] T extends Object declared in method <T>with(Matcher<T>)
    [javac] /«BUILDDIR»/jmock2-2.5.1+dfsg/src/org/jmock/syntax/ArgumentConstraintPhrases.java:9: error: name clash: with(Matcher<Short>) and <T>with(Matcher<T>) have the same erasure
    [javac] short with(Matcher<Short> matcher);
    [javac] ^
    [javac] where T is a type-variable:
    [javac] T extends Object declared in method <T>with(Matcher<T>)
    [javac] /«BUILDDIR»/jmock2-2.5.1+dfsg/src/org/jmock/syntax/ArgumentConstraintPhrases.java:10: error: name clash: with(Matcher<Integer>) and <T>with(Matcher<T>) have the same erasure
    [javac] int with(Matcher<Integer> matcher);
    [javac] ^
    [javac] where T is a type-variable:
    [javac] T extends Object declared in method <T>with(Matcher<T>)
    [javac] /«BUILDDIR»/jmock2-2.5.1+dfsg/src/org/jmock/syntax/ArgumentConstraintPhrases.java:11: error: name clash: with(Matcher<Long>) and <T>with(Matcher<T>) have the same erasure
    [javac] long with(Matcher<Long> matcher);
    [javac] ^
    [javac] where T is a type-variable:
    [javac] T extends Object declared in method <T>with(Matcher<T>)
    [javac] /«BUILDDIR»/jmock2-2.5.1+dfsg/src/org/jmock/syntax/ArgumentConstraintPhrases.java:12: error: name clash: with(Matcher<Float>) and <T>with(Matcher<T>) have the same erasure
    [javac] float with(Matcher<Float> matcher);
    [javac] ^
    [javac] where T is a type-variable:
    [javac] T extends Object declared in method <T>with(Matcher<T>)
    [javac] /«BUILDDIR»/jmock2-2.5.1+dfsg/src/org/jmock/syntax/ArgumentConstraintPhrases.java:13: error: name clash: with(Matcher<Double>) and <T>with(Matcher<T>) have the same erasure
    [javac] double with(Matcher<Double> matcher);
    [javac] ^
    [javac] where T is a type-variable:
    [javac] T extends Object declared in method <T>with(Matcher<T>)
    [javac] /«BUILDDIR»/jmock2-2.5.1+dfsg/src/org/jmock/Expectations.java:141: error: name clash: <T>with(Matcher<T>) in Expectations and with(Matcher<Double>) in ArgumentConstraintPhrases have the same erasure, yet neither overrides the other
    [javac] public <T> T with(Matcher<T> matcher) {
    [javac] ^
    [javac] where T is a type-variable:
    [javac] T extends Object declared in method <T>with(Matcher<T>)
    [javac] Note: /«BUILDDIR»/jmock2-2.5.1+dfsg/src/org/jmock/integration/junit4/JMock.java uses or overrides a deprecated API.
    [javac] Note: Recompile with -Xlint:deprecation for details.
    [javac] 16 errors
    [javac] 3 warnings

BUILD FAILED
/«BUILDDIR»/jmock2-2.5.1+dfsg/build.xml:61: Compile failed; see the compiler error output for details.

Total time: 4 seconds
make: *** [debian/stamp-ant-build] Error 1
dpkg-buildpackage: error: debian/rules build gave error exit status 2
────────────────────────────────────────────────────────────────────────────────
Build finished at 20111109-2300

Finished
────────

E: Build failure (dpkg-buildpackage died)