diff --git a/Jenkinsfile b/Jenkinsfile index 99e7a01..9dc9a63 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,8 +17,8 @@ devToolsProject.run( data['venv'] = pyenv.createVirtualEnv(readFile('.python-version')) data.venv.run('pip install -r requirements-dev.txt') - data['groovy3Version'] = '3.0.10' - data['groovy4Version'] = '4.0.2' + data['groovy3Version'] = '3.0.22' + data['groovy4Version'] = '4.0.22' [data.groovy3Version, data.groovy4Version].each { groovyVersion -> String groovyZip = "apache-groovy-binary-${groovyVersion}.zip" diff --git a/README.md b/README.md index 5f6a5e8..9e9f1ca 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,8 @@ This repository provides a way to run [CodeNarc][codenarc-home] checks from a do image. CodeNarc analyzes Groovy code for defects, bad practices, inconsistencies, style issues and more. -CodeNarc, and Groovylint by extension, require Groovy 3.0 or greater. +CodeNarc, and Groovylint by extension, require Groovy 3.0.22 or greater (or Groovy 4.0.11 +or greater, if using Groovy 4.x). ## Usage @@ -48,7 +49,6 @@ $ docker run --rm -v `pwd`:/ws -u `id -u`:`id -g` abletonag/groovylint \ /opt/run_codenarc.py --single-file Jenkinsfile ``` - ### Running in a Docker container ```bash diff --git a/VERSION b/VERSION index 226468e..a551051 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.14.6 +0.15.0 diff --git a/ruleset.groovy b/ruleset.groovy index b602754..a93d495 100644 --- a/ruleset.groovy +++ b/ruleset.groovy @@ -30,6 +30,7 @@ ruleset { ruleset('rulesets/generic.xml') {} ruleset('rulesets/groovyism.xml') {} ruleset('rulesets/imports.xml') {} + ruleset('rulesets/jenkins.xml') {} ruleset('rulesets/naming.xml') { FactoryMethodName(enabled: false) VariableName(ignoreVariableNames: '_')