Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3403: Upgrade Spring IO Dependencies

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3403

* Upgrade to Gradle 1.12
* Make `schemaZip` Windows compatible

INT-3403: Fix the `replaceAll` logic

INT-3403: Apply SS & SWS releases
This commit is contained in:
Artem Bilan
2014-05-21 09:03:24 +03:00
committed by Gary Russell
parent 1cc8d8c7f1
commit 4c89d21195
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
build.gradle
View File

@@ -77,7 +77,7 @@ subprojects { subproject ->
derbyVersion = '10.10.1.1'
eclipseLinkVersion = '2.4.2'
ftpServerVersion = '1.0.6'
groovyVersion = '2.2.2'
groovyVersion = '2.3.0'
guavaVersion = '16.0.1'
hamcrestVersion = '1.3'
hibernateVersion = '4.2.11.Final'
@@ -108,14 +108,14 @@ subprojects { subproject ->
slf4jVersion = "1.7.6"
smackVersion = '3.2.1'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.3.3.RELEASE'
springDataMongoVersion = '1.5.0.BUILD-SNAPSHOT'
springDataRedisVersion = '1.3.0.BUILD-SNAPSHOT'
springGemfireVersion = '1.4.0.BUILD-SNAPSHOT'
springSecurityVersion = '3.2.3.RELEASE'
springDataMongoVersion = '1.5.0.RELEASE'
springDataRedisVersion = '1.3.0.RELEASE'
springGemfireVersion = '1.4.0.RELEASE'
springSecurityVersion = '3.2.4.RELEASE'
springSocialTwitterVersion = '1.1.0.RELEASE'
springRetryVersion = '1.1.0.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.0.3.RELEASE'
springWsVersion = '2.1.4.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.0.5.RELEASE'
springWsVersion = '2.2.0.RELEASE'
xmlUnitVersion = '1.5'
xstreamVersion = '1.4.7'
}
@@ -755,12 +755,12 @@ task schemaZip(type: Zip) {
}
subproject.sourceSets.main.resources.find {
it.path.endsWith('META-INF/spring.schemas')
it.path.endsWith("META-INF${File.separator}spring.schemas")
}?.withInputStream { schemas.load(it) }
for (def key : schemas.keySet()) {
File xsdFile = subproject.sourceSets.main.resources.find {
it.path.endsWith(schemas.get(key))
it.path.replaceAll('\\\\', '/').endsWith(schemas.get(key))
}
assert xsdFile != null
into ("integration/${shortName}") {
@@ -864,6 +864,6 @@ task dist(dependsOn: assemble) {
task wrapper(type: Wrapper) {
description = 'Generates gradlew[.bat] scripts'
gradleVersion = '1.10'
gradleVersion = '1.12'
distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
}

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 @@
#Mon Dec 30 17:33:31 EET 2013
#Wed May 21 07:12:56 EEST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

3
spring-integration-redis/src/test/java/org/springframework/integration/redis/util/AggregatorWithRedisLocksTests-context.xml
View File

@@ -14,9 +14,8 @@
<bean id="connectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory">
<property name="port" value="#{T(org.springframework.integration.redis.rules.RedisAvailableRule).REDIS_PORT}"/>
<!--TODO until SD-Redis will fix the TX support issue-->
<property name="usePool" value="false"/>
</bean>
<bean id="redisLockRegistry" class="org.springframework.integration.redis.util.RedisLockRegistry">
<constructor-arg ref="connectionFactory"/>
<constructor-arg value="aggregatorWithRedisLocksTests" />