Some various fixes

* Upgrade to Gradle-2.13
* Add `org.gradle.daemon=true` option
* Upgrade to SC-AWS-1.1.0.RELEASE
* Upgrade to SI-4.2.6
* Make `spring-cloud-aws-messaging` as `optional` since not all SI-AWS users require messaging components and needs only S3, for example
This commit is contained in:
Artem Bilan
2016-05-16 12:55:53 -04:00
parent 7824b647cf
commit f946a1d5e9
7 changed files with 35 additions and 30 deletions

View File

@@ -153,7 +153,7 @@ An XML variant may look like:
See more information in the `S3MessageHandler` JavaDocs and `<int-aws:s3-outbound-channel-adapter>` &
`<int-aws:s3-outbound-gateway>` descriptions.
###Inbound Channel Adapter
###Outbound Gateway
##Simple Email Service (SES)

View File

@@ -45,8 +45,8 @@ if (project.hasProperty('platformVersion')) {
ext {
servletApiVersion = '3.1.0'
slf4jVersion = '1.7.21'
springCloudAwsVersion = '1.1.0.RC1'
springIntegrationVersion = '4.2.5.RELEASE'
springCloudAwsVersion = '1.1.0.RELEASE'
springIntegrationVersion = '4.2.6.RELEASE'
idPrefix = 'aws'
@@ -68,8 +68,8 @@ jacoco {
dependencies {
compile "org.springframework.cloud:spring-cloud-aws-messaging:$springCloudAwsVersion"
compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion"
compile ("org.springframework.cloud:spring-cloud-aws-messaging:$springCloudAwsVersion", optional)
compile ("org.springframework.integration:spring-integration-file:$springIntegrationVersion", optional)
compile ("org.springframework.integration:spring-integration-http:$springIntegrationVersion", optional)
compile ("javax.servlet:javax.servlet-api:$servletApiVersion", provided)

View File

@@ -1 +1,2 @@
version=1.0.0.BUILD-SNAPSHOT
org.gradle.daemon=true

Binary file not shown.

View File

@@ -1,6 +1,6 @@
#Thu Mar 31 14:54:33 EDT 2016
#Mon May 16 12:42:39 EDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

46
gradlew vendored
View File

@@ -6,12 +6,30 @@
##
##############################################################################
# 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,26 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
# 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
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -85,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

6
gradlew.bat vendored
View File

@@ -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