[jenkins-json] 01/04: Depend on groovy insead of groovy2

[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-json.

commit c28b9e8aadb774e99dec29e18c88ec3149581559
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 13 15:43:28 2016 +0200

    Depend on groovy insead of groovy2
---
 debian/changelog   | 7 +++++++
 debian/control     | 4 ++--
 debian/maven.rules | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38e5257..65434fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jenkins-json (2.4-jenkins-3-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on groovy insead of groovy2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 13 May 2016 15:38:03 +0200
+
 jenkins-json (2.4-jenkins-3-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index a866e0f..8696cdb 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Build-Depends:
  maven-debian-helper
 Build-Depends-Indep:
  default-jdk-doc,
- groovy2,
- groovy2-doc,
+ groovy,
+ groovy-doc,
  libcommons-beanutils-java,
  libcommons-beanutils-java-doc,
  libcommons-collections3-java (>= 3.2.1-7~),
diff --git a/debian/maven.rules b/debian/maven.rules
index 8715912..5ca69f0 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,5 +20,4 @@ commons-collections commons-collections jar s/3\..*/3.x/ * *
 junit junit jar s/3\..*/3.x/ * *
 log4j log4j jar s/1\.2\..*/1.2.x/ * *
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
-org.codehaus.groovy groovy* * s/.*/2.x/ * *
 commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *

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