This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository xml-maven-plugin.
commit 38e35fa8dc6f3d817364c5fc055b8f62a8af01b1 Author: Emmanuel Bourg <[email protected]> Date: Mon Jul 31 17:34:34 2017 +0200 Depend on libmaven3-core-java instead of libmaven2-core-java --- debian/changelog | 1 + debian/control | 3 ++- debian/maven.rules | 6 ++---- debian/patches/junit-dependency.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c261d06..3b0c533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xml-maven-plugin (1.0.1-3) UNRELEASED; urgency=medium * Team upload. + * Depend on libmaven3-core-java instead of libmaven2-core-java * Moved the package to Git * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 diff --git a/debian/control b/debian/control index 9ef7906..04bc664 100644 --- a/debian/control +++ b/debian/control @@ -6,11 +6,12 @@ Uploaders: Eugene Zhukov <[email protected]> Build-Depends: debhelper (>= 10), default-jdk, + junit4, libjaxp1.3-java, libmaven-invoker-plugin-java, libmaven-plugin-testing-java, libmaven-plugin-tools-java, - libmaven2-core-java, + libmaven3-core-java, libplexus-io-java, libplexus-resources-java, libplexus-utils-java, diff --git a/debian/maven.rules b/debian/maven.rules index e69d17b..66a88c3 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,7 +1,5 @@ +junit junit * s/.*/4.x/ * * net.sf.saxon s/saxon/Saxon-HE jar s/.*/debian * * org.codehaus.plexus plexus-resources jar s/1\..*/1.x/ * * -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-plugin-testing-tools * s/.*/debian/ * * -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-test-tools * s/.*/debian/ * * +org.apache.maven maven-* * s/.*/3.x/ * * diff --git a/debian/patches/junit-dependency.patch b/debian/patches/junit-dependency.patch new file mode 100644 index 0000000..e95f0d9 --- /dev/null +++ b/debian/patches/junit-dependency.patch @@ -0,0 +1,18 @@ +Description: Adds the missing junit dependency +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/pom.xml ++++ b/pom.xml +@@ -139,6 +139,12 @@ + <version>2.6.1</version> + </dependency> + <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ <version>4.12</version> ++ <scope>test</scope> ++ </dependency> ++ <dependency> + <groupId>org.apache.maven.plugin-testing</groupId> + <artifactId>maven-plugin-testing-harness</artifactId> + <version>2.1</version> diff --git a/debian/patches/series b/debian/patches/series index b59451d..803a06a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ test_exclude.patch +junit-dependency.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xml-maven-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
