This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-archiver.
commit ea8498dcf60fa90a6bfbb0633bd80f1712c43569 Author: Emmanuel Bourg <[email protected]> Date: Wed Aug 30 10:28:59 2017 +0200 Depend on libplexus-container-default1.5-java instead of libplexus-containers-java --- debian/changelog | 2 ++ debian/control | 2 +- debian/maven.rules | 2 +- debian/patches/05-plexus-containers-compatibility.patch | 14 ++++++++++++++ debian/patches/series | 1 + 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3270999..9c28f0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ plexus-archiver (3.5-2) UNRELEASED; urgency=medium * Team upload. + * Depend on libplexus-container-default1.5-java instead of + libplexus-containers-java * Standards-Version updated to 4.1.0 -- Emmanuel Bourg <[email protected]> Wed, 30 Aug 2017 10:21:06 +0200 diff --git a/debian/control b/debian/control index fa30aac..3d839ad 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: junit4, libcommons-compress-java (>= 1.9), libplexus-component-metadata-java, - libplexus-containers-java, + libplexus-container-default1.5-java, libplexus-io-java (>= 3.0), libplexus-utils2-java, libsnappy-java, diff --git a/debian/maven.rules b/debian/maven.rules index 5f27214..e387cc5 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,5 +1,5 @@ junit junit * s/.*/4.x/ * * -org.codehaus.plexus plexus-container-default jar s/.*/1.0-alpha/ +org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * * org.codehaus.plexus plexus-component-metadata maven-plugin s/1.6/1.5.5/ * * org.codehaus.plexus plexus-utils * s/.*/2.x/ * * s/org.iq80.snappy/org.xerial.snappy/ s/snappy/snappy-java/ * s/.*/debian/ * * diff --git a/debian/patches/05-plexus-containers-compatibility.patch b/debian/patches/05-plexus-containers-compatibility.patch new file mode 100644 index 0000000..a1b756a --- /dev/null +++ b/debian/patches/05-plexus-containers-compatibility.patch @@ -0,0 +1,14 @@ +Description: Fixes the compatibility with the version of Plexus Containers in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java ++++ b/src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java +@@ -31,7 +31,7 @@ + throws Exception + { + super.setUp(); +- getContainer().getLoggerManager().setThreshold( Logger.LEVEL_DEBUG ); ++ ((org.codehaus.plexus.DefaultPlexusContainer) getContainer()).getLoggerManager().setThreshold( Logger.LEVEL_DEBUG ); + } + + public void testZipArchiver() diff --git a/debian/patches/series b/debian/patches/series index 5ed5afa..f6fb2d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 02-snappy-compatibility.patch 03-plexus-utils-compatibility.patch 04-ignore-utf8-unzip-test.patch +05-plexus-containers-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-archiver.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
