diff -Nru maven-replacer-plugin-1.5.3/debian/changelog maven-replacer-plugin-1.5.3/debian/changelog --- maven-replacer-plugin-1.5.3/debian/changelog 2017-08-02 09:28:33.000000000 +0000 +++ maven-replacer-plugin-1.5.3/debian/changelog 2019-09-18 08:30:55.000000000 +0000 @@ -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 Wed, 18 Sep 2019 10:30:55 +0200 + maven-replacer-plugin (1.5.3-2) unstable; urgency=medium * Team upload. diff -Nru maven-replacer-plugin-1.5.3/debian/compat maven-replacer-plugin-1.5.3/debian/compat --- maven-replacer-plugin-1.5.3/debian/compat 2017-08-02 09:09:39.000000000 +0000 +++ maven-replacer-plugin-1.5.3/debian/compat 2019-09-18 08:24:25.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru maven-replacer-plugin-1.5.3/debian/control maven-replacer-plugin-1.5.3/debian/control --- maven-replacer-plugin-1.5.3/debian/control 2017-08-02 09:20:09.000000000 +0000 +++ maven-replacer-plugin-1.5.3/debian/control 2019-09-18 08:24:25.000000000 +0000 @@ -3,19 +3,21 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Timo Aaltonen -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 diff -Nru maven-replacer-plugin-1.5.3/debian/maven.cleanIgnoreRules maven-replacer-plugin-1.5.3/debian/maven.cleanIgnoreRules --- maven-replacer-plugin-1.5.3/debian/maven.cleanIgnoreRules 2015-12-14 17:58:53.000000000 +0000 +++ maven-replacer-plugin-1.5.3/debian/maven.cleanIgnoreRules 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ - diff -Nru maven-replacer-plugin-1.5.3/debian/maven.properties maven-replacer-plugin-1.5.3/debian/maven.properties --- maven-replacer-plugin-1.5.3/debian/maven.properties 2017-08-02 09:26:33.000000000 +0000 +++ maven-replacer-plugin-1.5.3/debian/maven.properties 2019-09-18 08:28:27.000000000 +0000 @@ -4,4 +4,4 @@ maven.test.skip=false project.build.sourceEncoding=UTF-8 -user.home=. +user.home=target diff -Nru maven-replacer-plugin-1.5.3/debian/maven.publishedRules maven-replacer-plugin-1.5.3/debian/maven.publishedRules --- maven-replacer-plugin-1.5.3/debian/maven.publishedRules 2015-12-14 17:58:53.000000000 +0000 +++ maven-replacer-plugin-1.5.3/debian/maven.publishedRules 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ - diff -Nru maven-replacer-plugin-1.5.3/debian/patches/02-mockito-compatibility.patch maven-replacer-plugin-1.5.3/debian/patches/02-mockito-compatibility.patch --- maven-replacer-plugin-1.5.3/debian/patches/02-mockito-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ maven-replacer-plugin-1.5.3/debian/patches/02-mockito-compatibility.patch 2019-09-18 08:22:08.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Fixes the compatibility with the version of Mockito in Debian +Author: Emmanuel Bourg +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); diff -Nru maven-replacer-plugin-1.5.3/debian/patches/series maven-replacer-plugin-1.5.3/debian/patches/series --- maven-replacer-plugin-1.5.3/debian/patches/series 2017-08-02 09:18:53.000000000 +0000 +++ maven-replacer-plugin-1.5.3/debian/patches/series 2019-09-17 22:34:38.000000000 +0000 @@ -1 +1,2 @@ 01-hamcrest-compatibility.patch +02-mockito-compatibility.patch diff -Nru maven-replacer-plugin-1.5.3/debian/rules maven-replacer-plugin-1.5.3/debian/rules --- maven-replacer-plugin-1.5.3/debian/rules 2017-08-02 09:09:50.000000000 +0000 +++ maven-replacer-plugin-1.5.3/debian/rules 2019-09-18 08:24:16.000000000 +0000 @@ -2,6 +2,3 @@ %: dh $@ - -get-orig-source: - uscan --download-current-version --force-download --rename