This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository build-helper-maven-plugin.
commit 87ee65a49788e72bc7932476881cad75178d1666 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 20 01:19:39 2017 +0200 Depend on libmaven3-core-java instead of libmaven2-core-java --- debian/changelog | 3 ++- debian/control | 2 +- debian/maven.rules | 3 +++ debian/patches/01-maven-compatibility.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bbe0246..0818fc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -build-helper-maven-plugin (1.11-1) UNRELEASED; urgency=medium +build-helper-maven-plugin (3.0.0-1) UNRELEASED; urgency=medium * New upstream release - New dependency on libmaven-file-management-java - New build dependency on testng + - Depend on libmaven3-core-java instead of libmaven2-core-java * Build with the DH sequencer instead of CDBS * Track and download the new releases from GitHub * Removed the -java-doc package diff --git a/debian/control b/debian/control index 07db4db..8b8ed23 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.2) Build-Depends-Indep: libmaven-file-management-java, libmaven-invoker-plugin-java, libmaven-plugin-tools-java (>= 3.0), - libmaven2-core-java, + libmaven3-core-java, libplexus-utils-java, testng Standards-Version: 4.0.0 diff --git a/debian/maven.rules b/debian/maven.rules index d8a1ccb..80d62d5 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1 +1,4 @@ org.testng testng * s/.*/6.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/ * * diff --git a/debian/patches/01-maven-compatibility.patch b/debian/patches/01-maven-compatibility.patch new file mode 100644 index 0000000..6848cdb --- /dev/null +++ b/debian/patches/01-maven-compatibility.patch @@ -0,0 +1,17 @@ +Description: Fixes the compatibility with the version of Maven in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/pom.xml ++++ b/pom.xml +@@ -88,6 +88,11 @@ + <version>${mavenVersion}</version> + </dependency> + <dependency> ++ <groupId>org.apache.maven</groupId> ++ <artifactId>maven-compat</artifactId> ++ <version>${mavenVersion}</version> ++ </dependency> ++ <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>3.5</version> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..09d1b63 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-maven-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/build-helper-maven-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
