This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-resources-plugin.
commit e423aad9cad246a44026833ac0387a7e9961e4f7 Author: Emmanuel Bourg <[email protected]> Date: Tue Jul 18 09:13:34 2017 +0200 Depend on libmaven3-core-java instead of libmaven2-core-java --- debian/changelog | 3 ++- debian/control | 4 ++-- debian/maven.rules | 9 +++++++++ debian/patches/02-aether-compatibility.patch | 14 ++++++++++++++ debian/patches/series | 1 + 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e96e551..4799d61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -maven-resources-plugin (2.7-1) UNRELEASED; urgency=medium +maven-resources-plugin (3.0.0-1) UNRELEASED; urgency=medium * Team upload. * New upstream release - Refreshed the patch + - Depend on libmaven3-core-java instead of libmaven2-core-java * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 * Use secure Vcs-* URLs diff --git a/debian/control b/debian/control index 984aae1..1a4e9fd 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.4) Build-Depends-Indep: libmaven-filtering-java, libmaven-plugin-testing-java, libmaven-plugin-tools-java, - libmaven2-core-java, - libplexus-utils-java, + libmaven3-core-java, + libplexus-utils2-java (>= 3.0), Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-resources-plugin.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-resources-plugin.git diff --git a/debian/maven.rules b/debian/maven.rules index 4be060f..cf06a39 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -19,3 +19,12 @@ s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * * + +org.apache.maven maven-artifact * s/.*/3.x/ * * +org.apache.maven maven-compat * s/.*/3.x/ * * +org.apache.maven maven-core * s/.*/3.x/ * * +org.apache.maven maven-plugin-api * s/.*/3.x/ * * +org.apache.maven maven-settings * s/.*/3.x/ * * +org.apache.maven maven-model * s/.*/3.x/ * * + +org.codehaus.plexus plexus-utils * s/.*/2.x/ * * diff --git a/debian/patches/02-aether-compatibility.patch b/debian/patches/02-aether-compatibility.patch new file mode 100644 index 0000000..a5bbee5 --- /dev/null +++ b/debian/patches/02-aether-compatibility.patch @@ -0,0 +1,14 @@ +Description: Fixes the compatibility with the latest version of Aether/Maven Resolver +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java ++++ b/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java +@@ -38,7 +38,7 @@ + import org.codehaus.plexus.PlexusContainer; + import org.codehaus.plexus.util.FileUtils; + import org.codehaus.plexus.util.IOUtil; +-import org.sonatype.aether.RepositorySystemSession; ++import org.eclipse.aether.RepositorySystemSession; + + public class ResourcesMojoTest + extends AbstractMojoTestCase diff --git a/debian/patches/series b/debian/patches/series index 6e075d2..1accad3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01-ignore-failing-tests.patch +02-aether-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-resources-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
