Emmanuel Bourg pushed to branch master at Debian Java Maintainers / junit4
Commits: 2264212b by Emmanuel Bourg at 2022-09-28T09:09:50+02:00 Removed the dependency on libhamcrest-java-doc - - - - - 0185dbc7 by Emmanuel Bourg at 2022-09-28T09:15:16+02:00 Fixed the build failure with Hamcrest 2.x - - - - - 4e00f72a by Emmanuel Bourg at 2022-09-28T09:15:22+02:00 Standards-Version updated to 4.6.1 - - - - - ca02568a by Emmanuel Bourg at 2022-09-28T09:15:52+02:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/hamcrest-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +junit4 (4.13.2-2) unstable; urgency=medium + + * Fixed the build failure with Hamcrest 2.x + * Removed the dependency on libhamcrest-java-doc + * Standards-Version updated to 4.6.1 + + -- Emmanuel Bourg <[email protected]> Wed, 28 Sep 2022 09:15:47 +0200 + junit4 (4.13.2-1) unstable; urgency=medium * New upstream release ===================================== debian/control ===================================== @@ -14,10 +14,9 @@ Build-Depends: default-jdk-doc, javahelper, libhamcrest-java (>= 1.3), - libhamcrest-java-doc, libmaven-javadoc-plugin-java, maven-debian-helper (>= 2.2) -Standards-Version: 4.6.0.1 +Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/java-team/junit4.git Vcs-Browser: https://salsa.debian.org/java-team/junit4 Homepage: http://www.junit.org @@ -39,7 +38,7 @@ Package: junit4-doc Architecture: all Section: doc Depends: ${misc:Depends} -Recommends: default-jdk-doc, libhamcrest-java-doc +Recommends: default-jdk-doc Suggests: junit4 Description: JUnit regression test framework for Java - documentation JUnit is a simple framework to write repeatable tests. It is an ===================================== debian/patches/hamcrest-compatibility.patch ===================================== @@ -0,0 +1,24 @@ +Description: Fixes the compatibility with the version of Hamcrest in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/src/main/java/org/junit/matchers/JUnitMatchers.java ++++ b/src/main/java/org/junit/matchers/JUnitMatchers.java +@@ -57,7 +57,7 @@ + */ + @Deprecated + public static <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) { +- return CoreMatchers.everyItem(elementMatcher); ++ return CoreMatchers.everyItem((Matcher) elementMatcher); + } + + /** +--- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java ++++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java +@@ -109,6 +109,6 @@ + } + + private Matcher<Iterable<Failure>> empty() { +- return everyItem(nullValue(Failure.class)); ++ return everyItem((Matcher) nullValue(Failure.class)); + } + } ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ exclude-dependency-sources.patch Version.patch java17-compatibility.patch +hamcrest-compatibility.patch View it on GitLab: https://salsa.debian.org/java-team/junit4/-/compare/1ea3c97aeb928f3057c2e67a752069eecf2b4f49...ca02568ad58c06453d44426418d56daf2a5a1cf7 -- View it on GitLab: https://salsa.debian.org/java-team/junit4/-/compare/1ea3c97aeb928f3057c2e67a752069eecf2b4f49...ca02568ad58c06453d44426418d56daf2a5a1cf7 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
