Merge remote-tracking branch 'origin/4.10.8'

Author: yin-bp

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
-	    repositories {	      
-	        mavenCentral()	
+	    repositories {	
+		   mavenCentral()	
 	        //mavenLocal()        
 	    }
 

commonstyle/.project.bak

@@ -7,6 +7,7 @@ sourceSets {
         }
        resources{
         	srcDir 'resources'
+        	srcDir 'src' exclude '**/*.java'
         }
     }
     test {
@@ -62,7 +63,7 @@ dependencies {
             [group: 'commons-collections', name: 'commons-collections', version: '3.2.1', transitive: false],
              [group: 'com.fasterxml.uuid', name: 'java-uuid-generator', version: '3.1.2', transitive: false],
              [group: 'net.sourceforge.jtds', name: 'jtds', version: '1.3.1', transitive: false],
-             [group: 'mysql', name: 'mysql-connector-java', version: '5.1.39', transitive: false],
+             [group: 'mysql', name: 'mysql-connector-java', version: "${mysqlconnectorversion}", transitive: false],
              [group: 'org.xerial', name: 'sqlite-jdbc', version: '3.8.11.2', transitive: false],
              [group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.1', transitive: false],
             [group: 'commons-io', name: 'commons-io', version: '1.3.2', transitive: false],

commonstyle/build.gradle

@@ -40,7 +40,7 @@ dependencies {
         compileOnly ( 
          	fileTree(dir: '../lib/eclipse', include: '*.jar'),
           [group: 'net.sourceforge.jtds', name: 'jtds', version: '1.3.1', transitive: false],
-             [group: 'mysql', name: 'mysql-connector-java', version: '3.1.14', transitive: false],
+             [group: 'mysql', name: 'mysql-connector-java', version: "${mysqlconnectorversion}", transitive: false],
 
     	)
 

gencode-core/build.gradle

@@ -45,7 +45,7 @@ dependencies {
             [group: 'commons-collections', name: 'commons-collections', version: '3.2.1', transitive: false],
              [group: 'com.fasterxml.uuid', name: 'java-uuid-generator', version: '3.1.2', transitive: false],
              [group: 'net.sourceforge.jtds', name: 'jtds', version: '1.3.1', transitive: false],
-             [group: 'mysql', name: 'mysql-connector-java', version: '3.1.14', transitive: false],
+             [group: 'mysql', name: 'mysql-connector-java', version: "${mysqlconnectorversion}", transitive: false],
              [group: 'org.xerial', name: 'sqlite-jdbc', version: '3.8.11.2', transitive: false],
 
                [group: 'com.bbossgroups', name: 'bboss-taglib', version: "${bboss_version}", transitive: false],

gencode-web-app/build.gradle

@@ -43,7 +43,7 @@ dependencies {
             [group: 'commons-collections', name: 'commons-collections', version: '3.2.1', transitive: false],
              [group: 'com.fasterxml.uuid', name: 'java-uuid-generator', version: '3.1.2', transitive: false],
              [group: 'net.sourceforge.jtds', name: 'jtds', version: '1.3.1', transitive: false],
-             [group: 'mysql', name: 'mysql-connector-java', version: '3.1.14', transitive: false],
+             [group: 'mysql', name: 'mysql-connector-java', version: "${mysqlconnectorversion}", transitive: false],
              [group: 'org.xerial', name: 'sqlite-jdbc', version: '3.8.11.2', transitive: false],
            // fileTree(dir: '../lib/jetty', include: '*.jar'),
             [group: 'com.bbossgroups', name: 'bboss-rt', version: "${PROJ_BBOSS_VERSION}", transitive: false],

gencode-web/build.gradle

@@ -1,6 +1,6 @@
 PROJ_GROUP=com.bbossgroups.gencode
 PROJ_VERSION=4.10.8
-jacksonversion=2.8.0
+jacksonversion=2.8.1
 PROJ_BBOSS_VERSION=5.0.1
 skipTest=true
 PROJ_WEBSITEURL=http://www.bbossgroups.com
@@ -32,5 +32,6 @@ scm_connection=scm:git:git@github.com:bbossgroups/bboss-gencode.git
 scm_developerConnection=scm:git:git@github.com:bbossgroups/bboss-gencode.git
 scm_url=https://github.com/bbossgroups/bboss-gencode
 uploadArchivesToMavenCenter=false
-enable_gretty=false
+enable_gretty=true
 mongodbversion=3.2.2
+mysqlconnectorversion=5.1.39