[libspring-java] 01/02: Depend on groovy instead 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 libspring-java.

commit cd33efe7fab88a98f2f61c78f7f9064206982033
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 18 08:52:05 2016 +0200

    Depend on groovy instead 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 551fb86..0af95c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libspring-java (4.0.9-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on groovy instead of groovy2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 11 May 2016 09:56:49 +0200
+
 libspring-java (4.0.9-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index e75ccfb..7d27f6c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends-Indep: bsh,
                      glassfish-javaee,
                      glassfish-toplink-essentials,
                      gradle-propdeps-plugin,
-                     groovy2,
+                     groovy,
                      jruby (>= 1.7.19~),
                      junit4 (>= 4.5),
                      libaopalliance-java,
@@ -143,7 +143,7 @@ Recommends: glassfish-javaee,
             libjodatime-java,
             libspring-instrument-java (= ${source:Version}),
             libtomcat8-java
-Suggests: bsh, groovy2, jruby (>= 1.7.19~)
+Suggests: bsh, groovy, jruby (>= 1.7.19~)
 Description: modular Java/J2EE application framework - Context
  Spring is a layered Java/J2EE application framework offering a lot of freedom
  to Java developers yet providing well documented and easy-to-use solutions for
diff --git a/debian/maven.rules b/debian/maven.rules
index d39a6f5..98cbd4f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -22,7 +22,6 @@ log4j log4j * s/.*/1.2.x/ * *
 org.apache.tomcat s/catalina/tomcat-catalina/ * s/.*/8.x/ * *
 org.codehaus.castor s/castor/castor-xml/ * s/.*/debian/ * *
 s/org.codehaus.fabric3.api/org.apache.geronimo.specs/ s/commonj/geronimo-commonj_1.1_spec/ * s/.*/debian/ * *
-org.codehaus.groovy groovy-all * s/.*/2.x/ * *
 org.eclipse.persistence javax.persistence * s/.*/2.x/ * *
 org.eclipse.persistence s/org.eclipse.persistence.*/eclipselink/ * s/.*/debian/ * *
 org.jruby s/jruby/jruby-core/ jar s/.*/debian/ * *

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