This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-install-plugin.
commit 02e679c29bfc204029f0623ef05d0f532cfef11e Author: Emmanuel Bourg <[email protected]> Date: Fri Sep 8 09:25:20 2017 +0200 Depend on libmaven3-core-java instead of libmaven2-core-java --- debian/changelog | 1 + debian/control | 5 +++-- debian/maven.rules | 5 ++++- debian/patches/02-junit-dependency.patch | 14 ++++++++++++++ debian/patches/series | 1 + 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2158b1b..bcb2da2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ maven-install-plugin (2.5.2-4) UNRELEASED; urgency=medium * Team upload. + * Depend on libmaven3-core-java instead of libmaven2-core-java * Removed the unused dependency on libplexus-digest-java -- Emmanuel Bourg <[email protected]> Fri, 21 Jul 2017 01:51:29 +0200 diff --git a/debian/control b/debian/control index 44b58c9..c3a38c9 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,10 @@ Build-Depends: debhelper (>= 10), default-jdk, junit4, - libmaven-plugin-testing-1.3-java, + libmaven-artifact-transfer-java, + libmaven-plugin-testing-java, libmaven-plugin-tools-java (>= 3.2), - libmaven2-core-java, + libmaven3-core-java, libplexus-utils-java, maven-debian-helper (>= 2.2) Standards-Version: 4.0.0 diff --git a/debian/maven.rules b/debian/maven.rules index a51e89c..6626229 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -16,4 +16,7 @@ # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ -org.apache.maven.plugin-testing maven-plugin-testing-harness * s/.*/1.x/ * * +junit junit * s/.*/4.x/ * * +org.apache.maven s/maven-project/maven-compat/ * s/.*/3.x/ * * +org.apache.maven maven-* * s/.*/3.x/ * * +s/org.apache.maven/org.apache.maven.shared/ s/maven-artifact-manager/maven-artifact-transfer/ * s/.*/debian/ * * diff --git a/debian/patches/02-junit-dependency.patch b/debian/patches/02-junit-dependency.patch new file mode 100644 index 0000000..cfd91c4 --- /dev/null +++ b/debian/patches/02-junit-dependency.patch @@ -0,0 +1,14 @@ +--- a/pom.xml ++++ b/pom.xml +@@ -105,6 +105,11 @@ + <scope>test</scope> + </dependency> + <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ <version>4.12</version> ++ </dependency> ++ <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.6</version> diff --git a/debian/patches/series b/debian/patches/series index c4eda76..9ab8a8a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01-add-commons-io-dependency.patch +02-junit-dependency.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-install-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
