Move master to version 5.3

This commit is contained in:
Artem Bilan
2020-01-22 18:23:16 -05:00
parent 086045f5b1
commit 4ff6288db5
2 changed files with 13 additions and 35 deletions

View File

@@ -3,7 +3,7 @@ buildscript {
maven { url 'https://repo.spring.io/libs-snapshot' }
}
dependencies {
classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE'
classpath 'io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE'
classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
classpath "gradle.plugin.org.gretty:gretty:2.3.1"
}
@@ -71,11 +71,17 @@ subprojects { subproject ->
}
developers {
developer {
id = 'abilan'
name = 'Artem Bilan'
email = 'abilan@pivotal.io'
roles = ["project lead"]
}
developer {
id = 'garyrussell'
name = 'Gary Russell'
email = 'grussell@pivotal.io'
roles = ["project lead"]
roles = ["lead emeritus"]
}
developer {
id = 'markfisher'
@@ -88,11 +94,6 @@ subprojects { subproject ->
name = 'Gunnar Hillert'
email = 'ghillert@pivotal.io'
}
developer {
id = 'abilan'
name = 'Artem Bilan'
email = 'abilan@pivotal.io'
}
}
if (subproject.plugins.hasPlugin('java')) {
@@ -208,13 +209,13 @@ subprojects { subproject ->
postgresVersion = '42.2.9'
subethasmtpVersion = '1.2'
slf4jVersion = '1.7.25'
springIntegrationVersion = '5.2.3.RELEASE'
springIntegrationVersion = '5.3.0.M1'
springIntegrationKafkaVersion = '3.2.1.RELEASE'
springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT'
springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT'
springKafkaVersion = '2.3.5.RELEASE'
springKafkaVersion = '2.4.1.RELEASE'
springVersion = '5.2.3.RELEASE'
springSecurityVersion = '5.2.1.RELEASE'
springSecurityVersion = '5.3.0.M1'
springWebFlowVersion = '2.3.3.RELEASE'
tilesJspVersion = '2.2.1'
validationApiVersion = '1.0.0.GA'
@@ -268,28 +269,6 @@ subprojects { subproject ->
}
}
task checkTestConfigs {
doLast {
def configFiles = []
sourceSets.test.allSource.srcDirs.each {
fileTree(it).include('**/*.xml').exclude('**/log4j2.xml').each { configFile ->
def configXml = new XmlParser(false, false).parse(configFile)
if (configXml.@'xsi:schemaLocation' ==~ /.*spring-[a-z-]*\d\.\d\.xsd.*/) {
configFiles << configFile
}
}
}
if (configFiles) {
throw new InvalidUserDataException('Hardcoded XSD version in the config files:\n' +
configFiles.collect { relativePath(it) }.join('\n') +
'\nPlease, use versionless schemaLocations for Spring XSDs to avoid issues with builds ' +
'on different versions of dependencies.')
}
}
}
test.dependsOn checkTestConfigs
build.dependsOn jacocoTestReport
}
@@ -1466,7 +1445,6 @@ project('tcp-with-headers') {
}
}
sonarqube {
properties {
property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"

View File

@@ -1,3 +1,3 @@
version=5.2.0.BUILD-SNAPSHOT
springBootVersion=2.2.3.BUILD-SNAPSHOT
version=5.3.0.BUILD-SNAPSHOT
springBootVersion=2.3.0.BUILD-SNAPSHOT
org.gradle.jvmargs=-Xmx1536m