[pkg-java] r18916 - trunk/commons-jci/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2015-11-20 12:38:25 +0000 (Fri, 20 Nov 2015)
New Revision: 18916

Modified:
   trunk/commons-jci/debian/build.properties
   trunk/commons-jci/debian/changelog
   trunk/commons-jci/debian/control
   trunk/commons-jci/debian/maven.rules
Log:
Transition to Groovy 2



Modified: trunk/commons-jci/debian/build.properties
===================================================================
--- trunk/commons-jci/debian/build.properties	2015-11-17 20:52:41 UTC (rev 18915)
+++ trunk/commons-jci/debian/build.properties	2015-11-20 12:38:25 UTC (rev 18916)
@@ -6,7 +6,7 @@
             /usr/share/java/commons-lang.jar:\
             /usr/share/java/commons-logging.jar:\
             /usr/share/java/asm4.jar:\
-            /usr/share/java/groovy.jar:\
+            /usr/share/java/groovy-2.x.jar:\
             /usr/share/java/js.jar:\
             /usr/share/java/janino.jar:\
             /usr/share/java/eclipse-ecj.jar:\

Modified: trunk/commons-jci/debian/changelog
===================================================================
--- trunk/commons-jci/debian/changelog	2015-11-17 20:52:41 UTC (rev 18915)
+++ trunk/commons-jci/debian/changelog	2015-11-20 12:38:25 UTC (rev 18916)
@@ -1,3 +1,10 @@
+commons-jci (1.1-3) unstable; urgency=medium
+
+  * Team upload.
+  * Transition to Groovy 2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 20 Nov 2015 13:32:21 +0100
+
 commons-jci (1.1-2) unstable; urgency=medium
 
   * Transition to libasm4-java

Modified: trunk/commons-jci/debian/control
===================================================================
--- trunk/commons-jci/debian/control	2015-11-17 20:52:41 UTC (rev 18915)
+++ trunk/commons-jci/debian/control	2015-11-20 12:38:25 UTC (rev 18916)
@@ -6,7 +6,7 @@
 Priority: optional
 Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, maven-ant-helper
 Build-Depends-Indep: default-jdk-doc,
-                     groovy,
+                     groovy2,
                      libasm4-java,
                      libcommons-io-java,
                      libcommons-lang-java,
@@ -56,7 +56,7 @@
 
 Package: libcommons-jci-groovy-java
 Architecture: all
-Depends: groovy, libcommons-jci-java (= ${source:Version}), ${misc:Depends}
+Depends: groovy2, libcommons-jci-java (= ${source:Version}), ${misc:Depends}
 Description: common Java interface for various compilers - Groovy
  Commons JCI is a common Java compiler interface for various compilers.
  .

Modified: trunk/commons-jci/debian/maven.rules
===================================================================
--- trunk/commons-jci/debian/maven.rules	2015-11-17 20:52:41 UTC (rev 18915)
+++ trunk/commons-jci/debian/maven.rules	2015-11-20 12:38:25 UTC (rev 18916)
@@ -1,4 +1,4 @@
 commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/
 junit junit jar s/3\..*/3.x/
 org.apache.maven.plugins maven-surefire-plugin maven-plugin s/.*/2.4.3/
-s/groovy/org.codehaus.groovy/ s/groovy-all/groovy/ * s/.*/debian/
+s/groovy/org.codehaus.groovy/ s/groovy-all/groovy/ * s/.*/2.x/