Update project settings

build.gradle

@@ -7,20 +7,22 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.codehaus.griffon:gradle-griffon-plugin:2.2.0'
-        classpath 'org.codehaus.griffon:gradle-griffon-build-plugin:2.2.0'
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
+        classpath 'org.codehaus.griffon:gradle-griffon-plugin:2.9.1'
+        classpath 'org.codehaus.griffon:gradle-griffon-build-plugin:2.9.1'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.7.1'
         classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1'
-        classpath 'org.ajoberstar:gradle-git:1.0.0'
-        classpath 'org.kordamp.gradle:stats-gradle-plugin:0.1.3'
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.8'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'org.ajoberstar:gradle-git:1.3.2'
+        classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
+        classpath 'net.nemerosa:versioning:2.6.0'
     }
 }
 
 apply plugin: 'base'
 apply plugin: 'idea'
 apply plugin: 'com.github.kt3k.coveralls'
+apply plugin: 'net.nemerosa.versioning'
 apply plugin: 'build-dashboard'
 apply from: 'gradle/idea.gradle'
 apply plugin: 'org.codehaus.griffon.griffon-build'
@@ -29,8 +31,11 @@ apply plugin: 'org.ajoberstar.github-pages'
 
 Date buildTimeAndDate = new Date()
 ext {
+    buildBy = System.properties['user.name']
     buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
     buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
+    buildRevision = versioning.info.commit
+    buildCreatedBy = "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString()
 }
 
 allprojects {
@@ -60,11 +65,6 @@ ext.jacocoProjects = []
 
 subprojects { subproj ->
     plugins.withType(JavaPlugin) {
-        configurations {
-            compileOnly
-            testCompileOnly
-        }
-
         subproj.tasks.withType(JavaCompile) {
             sourceCompatibility = subproj.sourceCompatibility
             targetCompatibility = subproj.targetCompatibility
@@ -75,30 +75,10 @@ subprojects { subproj ->
             targetCompatibility = subproj.targetCompatibility
         }
 
-        sourceSets {
-            main {
-                compileClasspath += [configurations.compileOnly]
-            }
-            test {
-                compileClasspath += [configurations.testCompileOnly]
-            }
-        }
-
-        javadoc {
-            classpath += [configurations.compileOnly]
-        }
-
-        idea {
-            module {
-                scopes.PROVIDED.plus += [configurations.compileOnly]
-                scopes.PROVIDED.plus += [configurations.testCompileOnly]
-            }
-        }
-
         dependencies {
             testCompile 'junit:junit:4.12'
-            testCompile 'org.spockframework:spock-core:0.7-groovy-2.0'
-            testCompile 'org.slf4j:slf4j-simple:1.7.10'
+            testCompile 'org.spockframework:spock-core:1.0-groovy-2.4'
+            testCompile "org.slf4j:slf4j-simple:$slf4jVersion"
         }
 
         task sourceJar(type: Jar) {

gradle.properties

@@ -1,7 +1,7 @@
 group=org.codehaus.griffon.plugins
 version=1.2.0
 pluginBaseName=griffon-datasource
-griffonVersion=2.2.0
+griffonVersion=2.9.1
 griffonPlugin=true
 publishJars=false
 sourceCompatibility=1.7
@@ -11,7 +11,8 @@ projectInceptionYear=2014
 projectWebsiteUrl=http://griffon-plugins.github.io/griffon-datasource-plugin
 projectIssueTrackerUrl=https://github.com/griffon-plugins/griffon-datasource-plugin/issues
 projectVcsUrl=https://github.com/griffon-plugins/griffon-datasource-plugin
-javadocFooter=Copyright © 2014 Andres Almiray. All rights reserved.
+javadocFooter=Copyright © 2014-2017 Andres Almiray. All rights reserved.
 projectLabels=griffon,plugin,datasource
-jacocoVersion=0.7.3.201502191951
-
+jacocoVersion  = 0.7.7.201606060606
+groovyVersion  = 2.4.8
+slf4jVersion   = 1.7.21

gradle/code-quality.gradle

@@ -51,8 +51,10 @@ license {
     mapping {
         java   = 'SLASHSTAR_STYLE'
         groovy = 'SLASHSTAR_STYLE'
+        dsld   = 'SLASHSTAR_STYLE'
+        gdsl   = 'SLASHSTAR_STYLE'
     }
-    ext.year = '2014-2015'
+    ext.year = '2014-2017'
     exclude '**/*.png'
 }
 

gradle/docs.gradle

@@ -10,11 +10,11 @@ javadoc {
     options.docTitle    = "$project.name $project.version API"
     options.footer      = javadocFooter
     options.links       = ['http://www.slf4j.org/apidocs/',
-                           'http://junit.org/javadoc/latest/',
+                           'http://junit.org/junit4/javadoc/latest/',
                            'http://docs.oracle.com/javase/7/docs/api/',
-                           'http://jsr-305.googlecode.com/svn/trunk/javadoc/',
-                           'http://atinject.googlecode.com/svn/trunk/javadoc/',
-                           'http://griffon.github.io/griffon/guide/api/']
+                           'http://aalmiray.github.io/jsr-305/apidocs/',
+                           'http://javax-inject.github.io/javax-inject/api/',
+                           'http://griffon-framework.org/guide/latest/api/']
 
     doLast { task ->
         copy {
@@ -41,10 +41,10 @@ if (plugins.hasPlugin('groovy')) {
         includePrivate = false
         link 'http://www.slf4j.org/apidocs/', 'org.slf4j.'
         link 'http://docs.oracle.com/javase/7/docs/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.'
-        link 'http://jsr-305.googlecode.com/svn/trunk/javadoc/', 'javax.annotation.'
-        link 'http://griffon.github.io/griffon/guide/api/', 'griffon.', 'org.codehaus.griffon.'
-        link 'http://junit.org/javadoc/latest/', 'org.junit.', 'junit.'
-        link 'http://atinject.googlecode.com/svn/trunk/javadoc/', 'javax.inject.'
+        link 'http://aalmiray.github.io/jsr-305/apidocs/', 'javax.annotation.'
+        link 'http://griffon-framework.org/guide/latest/api/', 'griffon.', 'org.codehaus.griffon.'
+        link 'http://junit.org/junit4/javadoc/latest/', 'org.junit.', 'junit.'
+        link 'http://javax-inject.github.io/javax-inject/api/', 'javax.inject.'
 
         doLast { task ->
             copy {

gradle/publishing.gradle

@@ -32,6 +32,7 @@ publishing {
                     }
                 }
                 asNode().children().last() + pomConfig
+                asNode().appendNode('description', project.projectDescription)
             }
         }
     }
@@ -40,10 +41,11 @@ publishing {
 jar {
     manifest {
         attributes(
-            'Built-By': System.properties['user.name'],
-            'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString(),
+            'Built-By': buildBy,
+            'Created-By': buildCreatedBy,
             'Build-Date': buildDate,
             'Build-Time': buildTime,
+            'Build-Revision': buildRevision,
             'Specification-Title': project.name,
             'Specification-Version': project.version,
             'Specification-Vendor': 'griffon-framework.org',
@@ -52,6 +54,11 @@ jar {
             'Implementation-Vendor': 'griffon-framework.org'
         )
     }
+
+    metaInf {
+        from rootProject.file('.')
+        include 'LICENSE'
+    }
 }
 
 if (!project.hasProperty('bintrayUsername')) ext.bintrayUsername = ''
@@ -73,4 +80,4 @@ bintray {
         vcsUrl = project.projectVcsUrl
         publicDownloadNumbers = true
     }
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Feb 16 21:39:44 CET 2015
+#Fri Jan 27 10:46:11 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

gradlew

@@ -1,17 +1,35 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

subprojects/griffon-datasource-core/griffon-datasource-core.gradle

@@ -15,8 +15,8 @@ dependencies {
     compile('commons-dbcp:commons-dbcp:1.4') { transitive = false }
     compile('commons-pool:commons-pool:1.6') { transitive = false }
 
-    testRuntime('com.h2database:h2:1.4.185') { transitive = false }
-    testRuntime "org.slf4j:slf4j-simple:1.7.10"
+    testRuntime('com.h2database:h2:1.4.193') { transitive = false }
+    testRuntime "org.slf4j:slf4j-simple:$slf4jVersion"
 
     testRuntime "org.codehaus.griffon:griffon-guice:${griffon.version}"
     testRuntime "org.codehaus.griffon:griffon-groovy:${griffon.version}"

subprojects/griffon-datasource-groovy-compile/griffon-datasource-groovy-compile.gradle

@@ -7,7 +7,7 @@ dependencies {
 
     testCompileOnly "org.codehaus.griffon:griffon-groovy-compile:${griffonVersion}"
     testRuntime "org.codehaus.griffon:griffon-guice:${griffonVersion}"
-    testRuntime "org.slf4j:slf4j-simple:1.7.10"
+    testRuntime "org.slf4j:slf4j-simple:$slf4jVersion"
 }
 
 compileGroovy.enabled = false