[jenkins] 03/03: Fixed a build failure caused by groovy 1.8.6-4

[Emmanuel Bourg]

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

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

commit 8cbfe668f3915ecc788451fc1f877ef6fa713b0f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 2 09:39:18 2014 +0200

    Fixed a build failure caused by groovy 1.8.6-4
---
 debian/changelog   | 2 ++
 debian/control     | 2 +-
 debian/maven.rules | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e686864..44858c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 jenkins (1.509.2+dfsg-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed a build failure caused by the relocation of the Maven artifacts
+    in groovy 1.8.6-4 (Closes: #759946)
   * Switch to debhelper level 9
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
diff --git a/debian/control b/debian/control
index 4c7eca8..2b36493 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends-Indep:
  ant-optional,
  glassfish-activation,
  glassfish-mail,
- groovy,
+ groovy (>= 1.8.6-4~),
  jenkins-crypto-util,
  jenkins-executable-war (>= 1.28),
  jenkins-instance-identity (>= 1.3),
diff --git a/debian/maven.rules b/debian/maven.rules
index 3f8bd56..7dbf597 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -33,10 +33,11 @@ com.octo.captcha s/jcaptcha-all/jcaptcha/ * s/.*/debian/ * *
 commons-collections commons-collections * s/3\..*/3.x/ * *
 commons-httpclient commons-httpclient * s/3\..*/3.x/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
-s/groovy/org.codehaus.groovy/ groovy * s/.*/debian/ * *
 org.kohsuke.stapler maven-stapler-plugin * s/.*/1.16/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
-s/groovy/org.codehaus.groovy/ groovy* * s/.*/debian/ * *
+s/groovy/org.codehaus.groovy/ groovy * s/.*/1.x/ * *
+s/groovy/org.codehaus.groovy/ groovy* * s/.*/1.x/ * *
+org.codehaus.groovy groovy* * s/.*/1.x/ * *
 org.mortbay.jetty * * s/6\..*/6.x/ * *
 org.springframework * * s/2\..*/3.x/ * *
 s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/2\..*/2.1/ * *

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