[resteasy] 04/04: Fixed the Maven rule for snakeyaml (Closes: #821158)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository resteasy.

commit e907a917c7cbffaeb72eefcd20d798f999b5af59
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Apr 16 22:52:57 2016 +0200

    Fixed the Maven rule for snakeyaml (Closes: #821158)
---
 debian/changelog   | 1 +
 debian/maven.rules | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49b4c43..7bd3fab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 resteasy (3.0.6-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the Maven rule for snakeyaml (Closes: #821158)
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* URLs
diff --git a/debian/maven.rules b/debian/maven.rules
index 8153c27..b310b7f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -5,10 +5,8 @@ com.fasterxml.jackson.core jackson-core jar s/2\..*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind jar s/2\..*/2.x/ * *
 junit junit jar s/4\..*/4.x/ * *
 org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * *
-org.yaml snakeyaml bundle s/1\..*/1.x/ * *
-org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * *
+org.yaml snakeyaml * s/.*/1.x/ * *
 com.sun.istack istack-commons-runtime * s/debian/2.17/ * *
 s/jboss/javassist/ javassist * s/.*/debian/ * *
 log4j log4j * s/1\.2\..*/1.2.x/ * *
-org.yaml snakeyaml * s/.*/1.12/ * *
 s/javax.annotation/org.apache.tomcat/ s/jsr250-api/tomcat-annotations-api/ * s/.*/8.x/ * *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/resteasy.git