[stapler] 01/03: Depend on groovy2 instead of groovy

[Emmanuel Bourg]

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

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

commit e05ca146627ad024b16c68999e11de0dc50488ff
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 16 16:38:38 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 2e23204..47b5834 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+stapler (1.242-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on groovy2 instead of groovy
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 May 2016 16:27:55 +0200
+
 stapler (1.242-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index a549587..78ae90c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  debhelper (>= 9),
  default-jdk,
  default-jdk-doc,
- groovy2,
+ groovy,
  javahelper,
  junit4,
  libannotation-indexer-java,
diff --git a/debian/libstapler-java.classpath b/debian/libstapler-java.classpath
index 74f6c0c..5a1be5a 100644
--- a/debian/libstapler-java.classpath
+++ b/debian/libstapler-java.classpath
@@ -1,4 +1,4 @@
 /usr/share/java/stapler.jar	servlet-api-2.5.jar commons-discovery.jar commons-beanutils.jar commons-io.jar localizer.jar hudson-json.jar tiger-types.jar guava.jar commons-fileupload.jar
 /usr/share/java/stapler-jelly.jar stapler.jar jenkins-commons-jelly.jar hudson-dom4j.jar commons-jexl.jar
-/usr/share/java/stapler-groovy.jar groovy-2.x.jar
+/usr/share/java/stapler-groovy.jar groovy.jar
 /usr/share/java/stapler-jsp.jar stapler.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index ee7bcdc..4b764aa 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -19,7 +19,6 @@
 junit junit jar s/4\..*/4.x/ * *
 commons-collections commons-collections * s/3\..*/3.x/ * *
 s/org.kohsuke/org.ow2.asm/ s/asm5/asm-all/ * s/.*/debian/ * *
-org.codehaus.groovy * * s/.*/2.x/ * *
 s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ jar s/2\..*/2.3/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ jar s/2\..*/3.1/ * *
 org.jvnet.maven-jellydoc-plugin * * s/.*/1.x/ * *

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