[codenarc] 04/06: 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 codenarc.

commit 77f5a05bfd24286251ee123565b3d824a71e1a4b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 20 11:21:54 2015 +0100

    Transition to Groovy 2
---
 debian/changelog              |  4 ++-
 debian/classpath-debian       |  2 +-
 debian/control                |  4 +--
 debian/patches/groovy_18.diff | 79 -------------------------------------------
 debian/patches/series         |  1 -
 5 files changed, 6 insertions(+), 84 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a5e871..c4b3977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-codenarc (0.17-3) UNRELEASED; urgency=medium
+codenarc (0.23-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Transition to Groovy 2
   * debian/control:
     - Standards-Version updated to 3.9.6 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/classpath-debian b/debian/classpath-debian
index 3324c19..0ee00ba 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -1,4 +1,4 @@
 usr/share/java/ant.jar
-usr/share/java/groovy-all.jar
+usr/share/java/groovy-all-2.x.jar
 usr/share/java/log4j-1.2.jar
 usr/share/java/GMetrics.jar
diff --git a/debian/control b/debian/control
index f8e0f8f..b477fec 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: ant,
                debhelper (>= 9),
                default-jdk,
                default-jdk-doc,
-               groovy,
+               groovy2,
                javahelper,
                libgmetrics-groovy-java,
                liblog4j1.2-java,
@@ -21,7 +21,7 @@ Homepage: http://codenarc.sourceforge.net/
 Package: libcodenarc-groovy-java
 Architecture: all
 Depends: ant,
-         groovy,
+         groovy2,
          libgmetrics-groovy-java,
          liblog4j1.2-java,
          ${misc:Depends}
diff --git a/debian/patches/groovy_18.diff b/debian/patches/groovy_18.diff
deleted file mode 100644
index 6dea06f..0000000
--- a/debian/patches/groovy_18.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Fix compat with Groovy 1.8
- RegexExpression and method 
- GroovyCodeVisitor.visitRegexExpression(RegexExpression expression) was 
- removed in 1.8
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2012-08-29
-Forwarded: no
---- a/src/main/groovy/org/codenarc/results/FileResults.groovy
-+++ b/src/main/groovy/org/codenarc/results/FileResults.groovy
-@@ -63,7 +63,7 @@
-      * @param recursive - true if the returned count should include subdirectories as well; defaults to true
-      * @return the number of violations with the specified priority
-      */
--    @Override
-+    //@Override
-     int getNumberOfViolationsWithPriority(int priority, boolean recursive=true) {
-         violations.sum(0) { violation -> violation.rule.priority == priority ? 1 : 0}
-     }
-@@ -73,7 +73,7 @@
-      * @param recursive - true if the returned count should include subdirectories as well
-      * @return the total number of files (with or without violations)
-      */
--    @Override
-+    //@Override
-     int getTotalNumberOfFiles(boolean recursive=true) {
-         1
-     }
-@@ -83,7 +83,7 @@
-      * @param recursive - ignored; defaults to true
-      * @return the number of files containing violations
-      */
--    @Override
-+    //@Override
-     int getNumberOfFilesWithViolations(boolean recursive=true) {
-         violations.empty ? 0 : 1
-     }
-@@ -100,4 +100,4 @@
-     String toString() {
-         "FileResults($path) $violations"
-     }
--}
-\ No newline at end of file
-+}
---- a/src/main/java/org/codenarc/rule/AbstractFieldVisitor.java
-+++ b/src/main/java/org/codenarc/rule/AbstractFieldVisitor.java
-@@ -404,7 +404,7 @@
-         throw new UnsupportedOperationException();
-     }
- 
--    @Override
-+    //@Override
-     public final void visitRegexExpression(RegexExpression expression) {
-         throw new UnsupportedOperationException();
-     }
---- a/src/main/java/org/codenarc/rule/AbstractMethodCallExpressionVisitor.java
-+++ b/src/main/java/org/codenarc/rule/AbstractMethodCallExpressionVisitor.java
-@@ -399,9 +399,9 @@
-         super.visitFieldExpression(expression);
-     }
- 
--    @Override
-+    //@Override
-     public final void visitRegexExpression(RegexExpression expression) {
--        super.visitRegexExpression(expression);
-+        //super.visitRegexExpression(expression);
-     }
- 
-     @Override
---- a/src/main/java/org/codenarc/rule/AbstractMethodVisitor.java
-+++ b/src/main/java/org/codenarc/rule/AbstractMethodVisitor.java
-@@ -432,7 +432,7 @@
-         throw new UnsupportedOperationException();
-     }
- 
--    @Override
-+    //@Override
-     public final void visitRegexExpression(RegexExpression expression) {
-         throw new UnsupportedOperationException();
-     }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ccd678a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-groovy_18.diff

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