SpringCloud/spring-cloud-connectors
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update gradle to 2.10. Update versions used in matrixTest.

Browse Source
This commit is contained in:
Scott Frederick
2016-06-29 22:16:31 -04:00
parent b677e18353
commit 1790affa29
7 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
build.gradle
View File

@@ -10,7 +10,7 @@ buildscript {
dependencies {
classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
classpath 'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE'
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0'
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
}
}
@@ -19,9 +19,11 @@ ext {
tomcatVersion = "7.0.53"
springAmqpVersion = "1.1.1.RELEASE"
springDataRedisVersion = "1.1.1.RELEASE"
springDataMongoVersion = "1.4.3.RELEASE"
springDataMongoVersion = "1.4.3.RELEASE"
mongoDriverVersion = "2.11.4"
springDataRedisVersion = "1.1.1.RELEASE"
jedisVersion = "2.1.0"
lettuceVersion = "3.4.3.Final"
@@ -31,7 +33,9 @@ ext {
mysqlDriverVersion = "5.1.29"
mariadbDriverVersion = "1.1.3"
postgresDriverVersion = "9.0-801.jdbc4"
javaxMailVersion = "1.4.7"
cglibVersion = "3.1"
jacksonVersion = "2.3.3"
@@ -61,14 +65,15 @@ subprojects {
apply plugin: 'propdeps-idea'
apply plugin: 'propdeps-eclipse'
apply plugin: "org.asciidoctor.gradle.asciidoctor"
asciidoctor {
sourceDir = new File("docs/src/main/asciidoc")
outputDir = new File("docs/target/generated-docs")
options = [
doctype: 'book',
attributes: [
'source-highlighter': 'coderay'
]
'doctype': 'book'
]
attributes = [
'source-highlighter': 'coderay'
]
}
@@ -192,21 +197,33 @@ configure(rootProject) {
ext {
matrix = [
"mongo14" : [springDataMongoVersion: "1.4.3.RELEASE"],
"mongo15" : [springDataMongoVersion: "1.5.5.RELEASE"],
"mongo16" : [springDataMongoVersion: "1.6.2.RELEASE"],
"mongo17" : [springDataMongoVersion: "1.7.0.RELEASE"],
"jedis22-redis11": [jedisVersion: "2.2.1", springDataRedisVersion: "1.1.1.RELEASE"],
"jedis23-redis12": [jedisVersion: "2.3.1", springDataRedisVersion: "1.2.1.RELEASE"],
"jedis23-redis13": [jedisVersion: "2.3.1", springDataRedisVersion: "1.3.0.RELEASE"],
"jedis24-redis13": [jedisVersion: "2.4.2", springDataRedisVersion: "1.3.0.RELEASE"],
"amqp11" : [springAmqpVersion: "1.1.4.RELEASE"],
"amqp12" : [springAmqpVersion: "1.2.2.RELEASE"],
"amqp13" : [springAmqpVersion: "1.3.6.RELEASE"],
"spring32" : [springVersion: "3.2.9.RELEASE"],
"spring40" : [springVersion: "4.0.5.RELEASE"],
"tomcat7" : [tomcatVersion: "7.0.53"],
"tomcat8" : [tomcatVersion: "8.0.24"],
"driver211-mongo14": [mongoDriverVersion: "2.11.4", springDataMongoVersion: "1.4.3.RELEASE"],
"driver211-mongo15": [mongoDriverVersion: "2.11.4", springDataMongoVersion: "1.5.5.RELEASE"],
"driver211-mongo16": [mongoDriverVersion: "2.11.4", springDataMongoVersion: "1.6.3.RELEASE"],
"driver213-mongo17": [mongoDriverVersion: "2.13.0", springDataMongoVersion: "1.7.2.RELEASE"],
"driver214-mongo18": [mongoDriverVersion: "2.13.0", springDataMongoVersion: "1.8.4.RELEASE"],
"driver214-mongo19": [mongoDriverVersion: "2.14.0", springDataMongoVersion: "1.9.2.RELEASE"],
"driver32-mongo19" : [mongoDriverVersion: "3.2.2", springDataMongoVersion: "1.9.2.RELEASE"],
"jedis25-redis14" : [jedisVersion: "2.5.2", springDataRedisVersion: "1.4.4.RELEASE"],
"jedis26-redis15" : [jedisVersion: "2.6.3", springDataRedisVersion: "1.5.2.RELEASE"],
"jedis27-redis16" : [jedisVersion: "2.7.3", springDataRedisVersion: "1.6.4.RELEASE"],
"jedis28-redis17" : [jedisVersion: "2.8.1", springDataRedisVersion: "1.7.2.RELEASE"],
// "lettuce34-redis15": [lettuceVersion: "3.4.3.Final", springDataRedisVersion: "1.5.2.RELEASE"],
// "lettuce34-redis16": [lettuceVersion: "3.4.3.Final", springDataRedisVersion: "1.6.4.RELEASE"],
// "lettuce34-redis17": [lettuceVersion: "3.4.3.Final", springDataRedisVersion: "1.7.2.RELEASE"],
"amqp11" : [springAmqpVersion: "1.1.4.RELEASE"],
"amqp12" : [springAmqpVersion: "1.2.2.RELEASE"],
"amqp13" : [springAmqpVersion: "1.3.9.RELEASE"],
"amqp14" : [springAmqpVersion: "1.4.6.RELEASE"],
"amqp15" : [springAmqpVersion: "1.5.6.RELEASE"],
"amqp16" : [springAmqpVersion: "1.6.0.RELEASE"],
"spring32" : [springVersion: "3.2.17.RELEASE"],
"spring40" : [springVersion: "4.0.9.RELEASE"],
"spring41" : [springVersion: "4.1.9.RELEASE"],
"spring42" : [springVersion: "4.2.6.RELEASE"],
"spring43" : [springVersion: "4.3.0.RELEASE"],
"tomcat7" : [tomcatVersion: "7.0.53"],
"tomcat8" : [tomcatVersion: "8.0.24"],
]
}
@@ -232,5 +249,5 @@ task dist(dependsOn: assemble) {
}
task wrapper(type: Wrapper) {
gradleVersion = '1.12'
gradleVersion = '2.10'
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Wed Jul 29 17:29:08 CDT 2015
#Wed Jun 29 17:49:51 EDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

10
gradlew vendored
View File

@@ -42,11 +42,6 @@ case "`uname`" in
;;
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"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >&-
cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -114,6 +109,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`

5
publish-maven.gradle
View File

@@ -52,6 +52,11 @@ def customizePom(pom, gradleProject) {
name = 'Ramnivas Laddad'
email = 'rladdad@gopivotal.com'
}
developer {
id = 'sfrederick'
name = 'Scott Frederick'
email = 'sfrederick@pivotal.io'
}
developer {
id = 'cschaefer'
name = 'Chris Schaefer'

29
spring-cloud-cloudfoundry-connector/build.gradle
View File

@@ -5,11 +5,11 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:0.8'
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
}
}
apply plugin: 'shadow'
apply plugin: 'com.github.johnrengelman.shadow'
apply from: "publish-maven.gradle"
dependencies {
@@ -18,27 +18,16 @@ dependencies {
compile("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
}
shadow {
artifactSet {
include 'com.fasterxml.jackson.core:jackson-*'
}
relocation {
pattern = 'com.fasterxml.jackson'
shadedPattern = 'org.springframework.cloud.cloudfoundry.com.fasterxml.jackson'
shadowJar {
classifier = null
dependencies {
include dependency('com.fasterxml.jackson.core:jackson-.*')
}
relocate 'com.fasterxml.jackson', 'org.springframework.cloud.cloudfoundry.com.fasterxml.jackson'
}
task moveShadowJar(type: Copy) {
from "$buildDir/distributions/${archivesBaseName}-${version}-shadow.jar"
into "$buildDir/libs"
rename { String fileName ->
fileName.replace('-shadow', '')
}
}
moveShadowJar.dependsOn shadowJar
assemble.dependsOn moveShadowJar
install.dependsOn moveShadowJar
assemble.dependsOn shadowJar
install.dependsOn shadowJar
configurations {
tests

5
spring-cloud-spring-service-connector/build.gradle
View File

@@ -23,7 +23,9 @@ dependencies {
}
optional("commons-dbcp:commons-dbcp:$commonDbcpVersion")
optional("com.zaxxer:HikariCP-java6:2.1.0")
optional("org.springframework.amqp:spring-rabbit:$springAmqpVersion")
optional("org.springframework.data:spring-data-redis:$springDataRedisVersion") {
exclude(group: 'org.springframework', module: 'spring-context-support')
}
@@ -34,5 +36,8 @@ dependencies {
exclude(group: 'org.springframework', module: 'spring-beans')
exclude(group: 'org.springframework', module: 'spring-expression')
exclude(group: 'org.springframework', module: 'spring-tx')
// depend on mongo-java-driver explicitly to control version used for testing
exclude(group: 'org.mongodb', module: 'mongo-java-driver')
}
optional("org.mongodb:mongo-java-driver:${mongoDriverVersion}")
}