This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ant-contrib.
commit b63125f8a39d71740d23ee3a0cf93b2a9aa10e5c Author: Emmanuel Bourg <[email protected]> Date: Wed Aug 3 00:30:41 2016 +0200 Marked the Maven dependencies as optional to match the package dependencies --- debian/changelog | 2 + .../patches/0004-optional-maven-dependencies.patch | 46 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 49 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6ad6960..8657c6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ ant-contrib (1.0~b3+svn177-8) UNRELEASED; urgency=medium + * Marked the Maven dependencies as optional to match the package dependencies + and the POM deployed on Maven Central * Build with the DH sequencer instead of CDBS * Removed the unused build dependencies on libcommons-cli-java, liboro-java, libcommons-codec-java and libcommons-logging-java diff --git a/debian/patches/0004-optional-maven-dependencies.patch b/debian/patches/0004-optional-maven-dependencies.patch new file mode 100644 index 0000000..087c53e --- /dev/null +++ b/debian/patches/0004-optional-maven-dependencies.patch @@ -0,0 +1,46 @@ +Description: Mark the Maven dependencies as optional to match the package dependencies and the POM deployed on Maven Central +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/pom.xml ++++ b/pom.xml +@@ -207,27 +207,32 @@ + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> ++ <scope>provided</scope> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.6.5</version> + <scope>test</scope> ++ <scope>provided</scope> + </dependency> + <dependency> + <groupId>bcel</groupId> + <artifactId>bcel</artifactId> + <version>5.1</version> ++ <optional>true</optional> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.8.1</version> ++ <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0.1</version> ++ <optional>true</optional> + </dependency> + <!-- could not find a copy of Ivy in M2's repository, + download http://www.jayasoft.org/downloads/ivy/1.4.1/ivy-1.4.1.jar +@@ -237,6 +242,7 @@ + <groupId>jayasoft</groupId> + <artifactId>ivy</artifactId> + <version>1.4.1</version> ++ <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> diff --git a/debian/patches/series b/debian/patches/series index 2c9f19d..5ad1c56 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0002-Ensure-for-task-is-specified-correctly.patch 0003-ivy-compatibility.patch +0004-optional-maven-dependencies.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant-contrib.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
