Upgrade to Gradle 2.14 and SF-4.3.1
In addition optimize `dist` task a bit excluding `BOM` module
This commit is contained in:
@@ -141,7 +141,7 @@ subprojects { subproject ->
|
||||
springSecurityVersion = '4.1.0.RELEASE'
|
||||
springSocialTwitterVersion = '1.1.2.RELEASE'
|
||||
springRetryVersion = '1.1.2.RELEASE'
|
||||
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.0.RELEASE'
|
||||
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.1.BUILD-SNAPSHOT'
|
||||
springWsVersion = '2.3.0.RELEASE'
|
||||
xmlUnitVersion = '1.6'
|
||||
xstreamVersion = '1.4.7'
|
||||
@@ -836,7 +836,7 @@ task schemaZip(type: Zip) {
|
||||
|
||||
duplicatesStrategy = 'exclude'
|
||||
|
||||
subprojects.each { subproject ->
|
||||
subprojects.findAll{ !it.name.endsWith('-bom') }.each { subproject ->
|
||||
def Properties schemas = new Properties();
|
||||
def shortName = subproject.name.replaceFirst("${rootProject.name}-", '')
|
||||
if (subproject.name.endsWith("-core")) {
|
||||
@@ -901,7 +901,7 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
|
||||
into "${baseDir}/schema"
|
||||
}
|
||||
|
||||
subprojects.each { subproject ->
|
||||
subprojects.findAll{ !it.name.endsWith('-bom') }.each { subproject ->
|
||||
into ("${baseDir}/libs") {
|
||||
from subproject.jar
|
||||
from subproject.sourcesJar
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
#Fri Apr 29 11:02:42 EDT 2016
|
||||
#Mon Jun 20 12:51:30 EDT 2016
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
|
||||
|
||||
Reference in New Issue
Block a user