diff -Nru tiles-autotag-1.2/debian/changelog tiles-autotag-1.2/debian/changelog --- tiles-autotag-1.2/debian/changelog 2016-07-18 14:21:33.000000000 +0000 +++ tiles-autotag-1.2/debian/changelog 2017-07-31 13:04:54.000000000 +0000 @@ -1,3 +1,11 @@ +tiles-autotag (1.2-2) unstable; urgency=medium + + * Depend on libmaven3-core-java instead of libmaven2-core-java + * Standards-Version updated to 4.0.0 + * Switch to debhelper level 10 + + -- Emmanuel Bourg Mon, 31 Jul 2017 15:04:54 +0200 + tiles-autotag (1.2-1) unstable; urgency=medium * New upstream release diff -Nru tiles-autotag-1.2/debian/compat tiles-autotag-1.2/debian/compat --- tiles-autotag-1.2/debian/compat 2016-07-18 14:09:45.000000000 +0000 +++ tiles-autotag-1.2/debian/compat 2017-07-31 12:53:56.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru tiles-autotag-1.2/debian/control tiles-autotag-1.2/debian/control --- tiles-autotag-1.2/debian/control 2016-07-18 14:09:45.000000000 +0000 +++ tiles-autotag-1.2/debian/control 2017-07-31 12:54:21.000000000 +0000 @@ -3,18 +3,18 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Emmanuel Bourg -Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5) +Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.5) Build-Depends-Indep: junit4, libcommons-io-java, libeasymock-java, libfreemarker-java, libmaven-bundle-plugin-java, - libmaven2-core-java, + libmaven3-core-java, libplexus-compiler-java, libqdox-java, libxstream-java, velocity -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/tiles-autotag.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/tiles-autotag.git Homepage: http://tiles.apache.org/tiles-autotag/ diff -Nru tiles-autotag-1.2/debian/maven.ignoreRules tiles-autotag-1.2/debian/maven.ignoreRules --- tiles-autotag-1.2/debian/maven.ignoreRules 2016-07-18 14:13:57.000000000 +0000 +++ tiles-autotag-1.2/debian/maven.ignoreRules 2017-07-31 12:59:19.000000000 +0000 @@ -1,3 +1,4 @@ org.apache.maven.plugins maven-release-plugin * * * * org.apache.maven.plugins maven-scm-publish-plugin * * * * +org.apache.maven maven-project * * * * diff -Nru tiles-autotag-1.2/debian/maven.rules tiles-autotag-1.2/debian/maven.rules --- tiles-autotag-1.2/debian/maven.rules 2016-07-18 14:09:45.000000000 +0000 +++ tiles-autotag-1.2/debian/maven.rules 2017-07-31 12:59:01.000000000 +0000 @@ -1,3 +1,4 @@ junit junit * s/.*/4.x/ * * org.codehaus.plexus plexus-compiler* * s/.*/2.x/ * * +org.apache.maven maven-* * s/.*/3.x/ * * diff -Nru tiles-autotag-1.2/debian/patches/04-maven-compatibility.patch tiles-autotag-1.2/debian/patches/04-maven-compatibility.patch --- tiles-autotag-1.2/debian/patches/04-maven-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ tiles-autotag-1.2/debian/patches/04-maven-compatibility.patch 2017-07-31 13:03:31.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Fixes the compatibility with the version of Maven in Debian +Author: Emmanuel Bourg +Forwarded: no +--- a/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojoTest.java ++++ b/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/AbstractGenerateMojoTest.java +@@ -88,9 +88,9 @@ + generator.generate(eq("my.package"), isA(TemplateSuite.class), eq(params), eq("my.package.Runtime"), eq("my.package.Request")); + expect(generator.isGeneratingClasses()).andReturn(true); + expect(generator.isGeneratingResources()).andReturn(true); +- expect(mavenProject.getResources()).andReturn(Collections.emptyList()); ++ expect(mavenProject.getResources()).andReturn(Collections.emptyList()); + mavenProject.addResource(isA(Resource.class)); +- expect(mavenProject.getCompileSourceRoots()).andReturn(Collections.emptyList()); ++ expect(mavenProject.getCompileSourceRoots()).andReturn(Collections.emptyList()); + mavenProject.addCompileSourceRoot(classesOutputDirectory.getAbsolutePath()); + + replay(mavenProject, buildContext, mojo, factory, generator, params); +--- a/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java ++++ b/maven-autotag-plugin/src/test/java/org/apache/tiles/autotag/plugin/CreateDescriptorMojoTest.java +@@ -92,7 +92,7 @@ + mojo.requestClass = ExampleRequest.class.getName(); + mojo.buildContext = buildContext; + +- expect(mavenProject.getResources()).andReturn(Collections.emptyList()); ++ expect(mavenProject.getResources()).andReturn(Collections.emptyList()); + mavenProject.addResource(isA(Resource.class)); + expect(buildContext.newScanner(isA(File.class))).andReturn(scanner); + scanner.setIncludes(isA(String[].class)); diff -Nru tiles-autotag-1.2/debian/patches/series tiles-autotag-1.2/debian/patches/series --- tiles-autotag-1.2/debian/patches/series 2016-07-18 14:09:45.000000000 +0000 +++ tiles-autotag-1.2/debian/patches/series 2017-07-31 13:00:13.000000000 +0000 @@ -1,3 +1,4 @@ 01-xmlpull-dependency.patch 02-velocity-compatibility.patch 03-reproducibility.patch +04-maven-compatibility.patch diff -Nru tiles-autotag-1.2/debian/rules tiles-autotag-1.2/debian/rules --- tiles-autotag-1.2/debian/rules 2016-07-18 14:09:45.000000000 +0000 +++ tiles-autotag-1.2/debian/rules 2017-07-31 12:53:56.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --buildsystem=maven + dh $@ get-orig-source: uscan --download-current-version --force-download --no-symlink