[bnd] 02/02: Revert switch from groovy2 to groovy

[Andreas Tille]

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

tille pushed a commit to branch debian/jessie-backports
in repository bnd.

commit cff8fb1a6975284ff3de6814c55c2c30dea92bd5
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jul 11 18:24:06 2016 +0200

    Revert switch from groovy2 to groovy
---
 debian/bootstrap.xml | 2 +-
 debian/changelog     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/bootstrap.xml b/debian/bootstrap.xml
index b136d1c..2f66de0 100644
--- a/debian/bootstrap.xml
+++ b/debian/bootstrap.xml
@@ -30,7 +30,7 @@
                 file="biz.aQute.bnd/src/aQute/bnd/ant/taskdef.properties" />
 
         <!-- Build the Gradle plugin -->
-        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="/usr/share/java/groovy-all.jar"/>
+        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="/usr/share/java/groovy-all-2.x.jar"/>
         <groovyc srcdir="biz.aQute.bnd.gradle/src" destdir="bootstrap/build" classpath="bootstrap/build:/usr/share/java/gradle-core.jar"></groovyc>
 
         <jar destfile="bootstrap/bnd.jar">
diff --git a/debian/changelog b/debian/changelog
index 5e0ce6c..3d19eaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ bnd (2.4.1-4~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
   * Force openjdk-8
+  * Revert switch from groovy2 to groovy
 
  -- Andreas Tille <tille at debian.org>  Thu, 07 Jul 2016 19:28:34 +0200
 

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