[mojarra] 03/07: 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 mojarra.

commit 7586893dbc727360ec1cc5177945da6e7895b090
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 13 13:36:33 2016 +0200

    Depend on groovy instead of groovy2
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 55f1e3a..c20258d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mojarra (2.2.8-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on groovy instead of groovy2
   * Standards-Version updated to 3.9.8 (no changes)
   * Use secure Vcs-* URLs
 
diff --git a/debian/control b/debian/control
index 40c50c8..e6d278d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends-Indep:
  default-jdk,
  default-jdk-doc,
  glassfish-javaee,
- groovy2,
+ groovy,
  libcdi-api-java,
  libcommons-beanutils-java,
  libcommons-collections3-java,
diff --git a/debian/rules b/debian/rules
index 8d3c824..28e366d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/dpkg/default.mk
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/servlet-api-3.0.jar:/usr/share/java/el-api-2.2.jar:/usr/share/java/jsp-api-2.2.jar:/usr/share/java/glassfish-javaee.jar:/usr/share/java/cdi-api.jar:/usr/share/java/atinject-jsr330-api.jar:/usr/share/java/geronimo-validation.jar:/usr/share/java/groovy-2.x.jar
+export CLASSPATH=/usr/share/java/servlet-api-3.0.jar:/usr/share/java/el-api-2.2.jar:/usr/share/java/jsp-api-2.2.jar:/usr/share/java/glassfish-javaee.jar:/usr/share/java/cdi-api.jar:/usr/share/java/atinject-jsr330-api.jar:/usr/share/java/geronimo-validation.jar:/usr/share/java/groovy.jar
 
 %:
 	dh $@ --with javahelper

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