[stapler] 01/03: Transition to Groovy 2

[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 9501df5152ba43b6cf1ffe93276d1beb47a997d8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 20 12:17:01 2015 +0100

    Transition to Groovy 2
---
 debian/changelog                 | 7 +++++++
 debian/control                   | 2 +-
 debian/libstapler-java.classpath | 2 +-
 debian/maven.rules               | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0ac4a7..af46924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+stapler (1.231-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Transition to Groovy 2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 20 Nov 2015 12:05:50 +0100
+
 stapler (1.231-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index a938693..666b5af 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  maven-debian-helper
 Build-Depends-Indep:
  default-jdk-doc,
- groovy (>= 1.8.6-4~),
+ groovy2,
  junit4,
  libannotation-indexer-java,
  libasm4-java,
diff --git a/debian/libstapler-java.classpath b/debian/libstapler-java.classpath
index 53be0ed..0541c31 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.jar
+/usr/share/java/stapler-groovy.jar groovy-2.x.jar
 /usr/share/java/stapler-jsp.jar stapler.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index f572b23..9b908bc 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -19,7 +19,7 @@
 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/.*/4.x/ * *
-org.codehaus.groovy * * s/.*/1.x/ * *
+org.codehaus.groovy * * s/.*/2.x/ * *
 s/javax.servlet/javax.servlet.jsp/ jsp-api jar s/2\..*/2.1/ * *
 javax.servlet servlet-api jar s/2\..*/2.5/ * *
 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