Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-replacer-plugin
Commits: fa83eb77 by Emmanuel Bourg at 2019-09-18T08:22:27Z Fixed the tests to work with Mockito 2.x - - - - - b64fd0c5 by Emmanuel Bourg at 2019-09-18T08:24:20Z Standards-Version updated to 4.4.0 - - - - - b7b419d2 by Emmanuel Bourg at 2019-09-18T08:24:25Z Switch to debhelper level 11 - - - - - 923b55d4 by Emmanuel Bourg at 2019-09-18T08:24:25Z Use salsa.debian.org Vcs-* URLs - - - - - 46362704 by Emmanuel Bourg at 2019-09-18T08:24:25Z Wrap and sort - - - - - a3efe341 by Emmanuel Bourg at 2019-09-18T08:28:06Z Removed the empty maven-debian-helper files - - - - - 77fd67c9 by Emmanuel Bourg at 2019-09-18T08:30:49Z Use the target/ directory as the user home directory for the tests - - - - - 193a59d3 by Emmanuel Bourg at 2019-09-18T08:31:05Z Upload to unstable - - - - - 9 changed files: - debian/changelog - debian/compat - debian/control - − debian/maven.cleanIgnoreRules - debian/maven.properties - − debian/maven.publishedRules - + debian/patches/02-mockito-compatibility.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +maven-replacer-plugin (1.5.3-3) unstable; urgency=medium + + * Team upload. + * Fixed the tests to work with Mockito 2.x + * Standards-Version updated to 4.4.0 + * Switch to debhelper level 11 + * Use salsa.debian.org Vcs-* URLs + * Use the target/ directory as the user home directory for the tests + + -- Emmanuel Bourg <[email protected]> Wed, 18 Sep 2019 10:30:55 +0200 + maven-replacer-plugin (1.5.3-2) unstable; urgency=medium * Team upload. ===================================== debian/compat ===================================== @@ -1 +1 @@ -10 +11 ===================================== debian/control ===================================== @@ -3,19 +3,21 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Timo Aaltonen <[email protected]> -Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.5) -Build-Depends-Indep: +Build-Depends: ant, + debhelper (>= 11), + default-jdk, junit4, libcommons-io-java, libcommons-lang-java (>= 2.6), libmaven-plugin-tools-java (>= 3.2), libmaven3-core-java, - libmockito-java, - libxerces2-java -Standards-Version: 4.0.0 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-replacer-plugin.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-replacer-plugin.git + libmockito-java (>= 2.0), + libxerces2-java, + maven-debian-helper (>= 1.5) +Standards-Version: 4.4.0 +Vcs-Git: https://salsa.debian.org/java-team/maven-replacer-plugin.git +Vcs-Browser: https://salsa.debian.org/java-team/maven-replacer-plugin Homepage: http://code.google.com/p/maven-replacer-plugin Package: libreplacer-java ===================================== debian/maven.cleanIgnoreRules deleted ===================================== @@ -1 +0,0 @@ - ===================================== debian/maven.properties ===================================== @@ -4,4 +4,4 @@ maven.test.skip=false project.build.sourceEncoding=UTF-8 -user.home=. +user.home=target ===================================== debian/maven.publishedRules deleted ===================================== @@ -1 +0,0 @@ - ===================================== debian/patches/02-mockito-compatibility.patch ===================================== @@ -0,0 +1,31 @@ +Description: Fixes the compatibility with the version of Mockito in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/test/java/com/google/code/maven_replacer_plugin/ReplacerMojoTest.java ++++ b/src/test/java/com/google/code/maven_replacer_plugin/ReplacerMojoTest.java +@@ -11,6 +11,7 @@ + import static org.mockito.Matchers.anyString; + import static org.mockito.Matchers.argThat; + import static org.mockito.Matchers.eq; ++import static org.mockito.Matchers.nullable; + import static org.mockito.Matchers.isA; + import static org.mockito.Mockito.mock; + import static org.mockito.Mockito.never; +@@ -428,7 +429,7 @@ + + @Test (expected = MojoExecutionException.class) + public void shouldRethrowIOExceptionsAsMojoExceptions() throws Exception { +- when(fileUtils.readFile(anyString(), anyString())).thenThrow(new IOException()); ++ when(fileUtils.readFile(nullable(String.class), nullable(String.class))).thenThrow(new IOException()); + + mojo.setRegexFlags(regexFlags); + mojo.setRegex(REGEX); +@@ -442,7 +443,7 @@ + + @Test + public void shouldNotThrowExceptionWhenIgnoringErrors() throws Exception { +- when(fileUtils.readFile(anyString(), anyString())).thenThrow(new IOException()); ++ when(fileUtils.readFile(nullable(String.class), nullable(String.class))).thenThrow(new IOException()); + + mojo.setIgnoreErrors(true); + mojo.setFile(FILE); ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 01-hamcrest-compatibility.patch +02-mockito-compatibility.patch ===================================== debian/rules ===================================== @@ -2,6 +2,3 @@ %: dh $@ - -get-orig-source: - uscan --download-current-version --force-download --rename View it on GitLab: https://salsa.debian.org/java-team/maven-replacer-plugin/compare/de828ddbaa9ee027e75cdc7fe731705cc83a074d...193a59d3038147cdaa165745521901f645416c61 -- View it on GitLab: https://salsa.debian.org/java-team/maven-replacer-plugin/compare/de828ddbaa9ee027e75cdc7fe731705cc83a074d...193a59d3038147cdaa165745521901f645416c61 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
