Merge branch 'release/0.36'

Author: dai0304

.gitignore

@@ -8,3 +8,4 @@ bin/
 .settings
 .idea
 *.iml
+out/

build.gradle

@@ -8,9 +8,10 @@ buildscript {
 	}
 	dependencies {
 		classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
-		classpath "com.diffplug.gradle.spotless:spotless:1.3.3"
+		classpath "com.diffplug.spotless:spotless-plugin-gradle:3.13.0"
 		classpath "de.thetaphi:forbiddenapis:2.2"
 		classpath "de.aaschmid:gradle-cpd-plugin:1.0"
+		classpath "io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE"
 	}
 }
 
@@ -39,9 +40,16 @@ description "Support library for Spring framework, AWS Java SDK and the others."
 
 subprojects {
 	apply plugin: "java"
+	apply plugin: "io.spring.dependency-management"
 	apply plugin: "maven"
 	apply plugin: "maven-publish"
 	apply plugin: "com.jfrog.bintray"
+
+	dependencyManagement {
+		imports {
+			mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion"
+		}
+	}
 
 	sourceCompatibility = targetCompatibility = 1.8
 
@@ -53,7 +61,7 @@ subprojects {
 	apply plugin: "jacoco"
 	apply plugin: "de.thetaphi.forbiddenapis"
 	apply plugin: "com.diffplug.gradle.spotless"
-	
+
 	// code quality configuration
 	apply from: "${rootProject.projectDir}/gradle/quality/checkstyle.gradle"
 	apply from: "${rootProject.projectDir}/gradle/quality/findbugs.gradle"
@@ -86,13 +94,14 @@ subprojects {
 	}
 
 	dependencies {
-		compile "org.slf4j:slf4j-api:$slf4jVersion"
+		compile "org.slf4j:slf4j-api"
 		compileOnly "org.projectlombok:lombok:$lombokVersion"
-		testCompile "org.slf4j:jul-to-slf4j:$slf4jVersion"
-		testCompile "ch.qos.logback:logback-classic:$logbackVersion"
+		testCompile "org.slf4j:jul-to-slf4j"
+		testCompile "org.slf4j:jcl-over-slf4j"
+		testCompile "ch.qos.logback:logback-classic"
 		testCompile "junit:junit:$junitVersion"
 		testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
-		testCompile "org.mockito:mockito-core:$mockitoCoreVersion"
+		testCompile "org.mockito:mockito-core"
 	}
 
 
@@ -135,6 +144,6 @@ subprojects {
 }
 
 // ======== wrapper ========
-task wrapper(type: Wrapper) {
-	gradleVersion = "4.1"
+wrapper {
+	gradleVersion = 4.8
 }

circle.yml

@@ -1,20 +1,11 @@
 # dependency versions
-springBootVersion = 1.3.3.RELEASE
-springVersion = 4.2.5.RELEASE
-springSecurityVersion = 4.0.3.RELEASE
-springRetryVersion = 1.1.2.RELEASE
-springSecurityOauth2Version = 2.0.6.RELEASE
-springDataVersion = 1.11.4.RELEASE
-springHateoasVersion = 0.19.0.RELEASE
-awsJavaSdkVersion = 1.11.21
-jacksonVersion = 2.7.2
+springBootVersion = 1.5.9.RELEASE
+springSecurityOauth2Version = 2.2.1.RELEASE
+awsJavaSdkVersion = 1.11.233
 
 lombokVersion = 1.16.18
 baseunitsVersion = 2.14
 
-slf4jVersion = 1.7.13
-logbackVersion = 1.1.3
-
-junitVersion = 4.11
+junitVersion = 4.12
 hamcrestVersion = 1.3
-mockitoCoreVersion = 1.9.5
+mockito.version = 2.19.0

gradle.properties

@@ -8,7 +8,7 @@ if (System.env.BINTRAY_USER && System.env.BINTRAY_KEY) {
 		dryRun = System.env.CIRCLE_BRANCH != "master"
 		publish = true
 		pkg {
-			repo = "spar-wings"
+			repo = "maven"
 			name = project.name
 			desc = project.description
 			websiteUrl = "https://github.com/dai0304/spar-wings"

gradle/bintray.gradle

@@ -2,7 +2,7 @@ spotless {
 	java {
 		licenseHeaderFile "${rootProject.projectDir}/config/spotless/spotless.license.java"
 		importOrderFile   "${rootProject.projectDir}/config/spotless/spotless.importorder"
-		eclipseFormatFile "${rootProject.projectDir}/config/spotless/spotless.eclipseformat.xml"
+		eclipse().configFile "${rootProject.projectDir}/config/spotless/spotless.eclipseformat.xml"
 
 		// Eclipse formatter screws up long literals with underscores inside of annotations (see issue #14)
 		//    @Max(value = 9_999_999 L) // what Eclipse does
@@ -14,10 +14,11 @@ spotless {
 		//    funcThatTakesLambdas(x -> {}, y -> {})	// what I wish Eclipse did
 		custom 'Lambda fix', { it.replace('} )', '})').replace('} ,', '},') }
 
+		removeUnusedImports()
 		indentWithTabs()
 		endWithNewline()
-		
-		customReplaceRegex 'Add space before comment asterisk', '^(\\t*)\\*', '$1 *'
+
+		replaceRegex 'Add space before comment asterisk', '^(\\t*)\\*', '$1 *'
 //		customReplaceRegex 'Remove indent before line comment', '^\\t*//', '//'
 	}
 

gradle/quality/spotless.gradle

@@ -1,6 +1,5 @@
-#Fri Apr 22 14:11:57 JST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

gradle/wrapper/gradle-wrapper.jar

@@ -1,25 +1,43 @@
-#!/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"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -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" "$@"