Start version 5.3

* Move `What's New` into `changes-5.1-5.2.adoc`
* Remove version from the `XSD` files:
 1. Align with SF
 2. The version for XSD doesn't matter for the current jar version,
 since only the version is available in classpath is from the current
 jar version
 3. Modify `spring.schemas` to map all the possible versions for XSD
 into the current one in a jar.
 This way target applications can upgrade without changing the version
 for XSD location and we don't need to require `versionless` variant
 any more
 4. The jar in classpath can handle only its own XSD, so independently
 of version or no-version variants we still may fail because the current
 jar may not support end-user code any more - need some fix over there
 anyway.
* Remove `checkTestConfigs` Gradle task since we don't worry about XSD
version any more
* Modify `schemaZip` Gradle task to populate XSDs into a distribution
still with a version to avoid overriding on-line XSDs for version `1.0.x`.
We may consider not do that since SF doesn't and just bite a bullet
for always overriding those on-line XSDs to the actual one from the latest
release.

Author: artembilan

build.gradle

@@ -230,29 +230,6 @@ subprojects { subproject ->
 	ext.xLintArg = '-Xlint:all,-options,-processing'
 	[compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg]
 
-	task checkTestConfigs {
-		inputs.files(
-				sourceSets.test.java.srcDirs.collect {
-							fileTree(it)
-								.include('**/*.xml')
-								.exclude('**/log4j2-test.xml')
-				})
-		outputs.dir('build/resources')
-		doLast {
-			def wrongConfigs = inputs.files.filter {
-				new XmlParser(false, false)
-						.parse(it)
-						.@'xsi:schemaLocation' ==~ /.*spring-[a-z-]*\d\.\d\.xsd.*/
-			}
-			if (!wrongConfigs.empty) {
-				throw new InvalidUserDataException('Hardcoded XSD version in the config files:\n' +
-						wrongConfigs.collect { relativePath(it) }.join('\n') +
-						'\nPlease, use versionless schemaLocations for Spring XSDs to avoid issues with builds ' +
-						'on different versions of dependencies.')
-			}
-		}
-	}
-
 	task updateCopyrights {
 		onlyIf { !System.getenv('TRAVIS') && !System.getenv('bamboo_buildKey') }
 		inputs.files(modifiedFiles.filter { f -> f.path.contains(subproject.name) })
@@ -310,7 +287,6 @@ subprojects { subproject ->
 	tasks.withType(Test).all {
 		// suppress all console output during testing unless running `gradle -i`
 		logging.captureStandardOutput(LogLevel.INFO)
-		dependsOn checkTestConfigs
 
 		if (name ==~ /(testAll)/) {
 			systemProperty 'RUN_LONG_INTEGRATION_TESTS', 'true'
@@ -1004,7 +980,7 @@ task schemaZip(type: Zip) {
 	description = "Builds -${archiveClassifier} archive containing all " +
 		"XSDs for deployment at static.springframework.org/schema."
 
-	duplicatesStrategy = 'exclude'
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
 	subprojects.findAll{ !it.name.endsWith('-bom') }.each { subproject ->
 		Properties schemas = new Properties();
@@ -1022,8 +998,12 @@ task schemaZip(type: Zip) {
 				it.path.replaceAll('\\\\', '/').endsWith(schemas.get(key))
 			}
 			assert xsdFile != null
-			into ("integration/${shortName}") {
+			into ("integration/$shortName") {
 				from xsdFile.path
+				rename { String fileName ->
+					String[] versionNumbers = project.version.split(/\./, 3)
+					fileName.replace('.xsd', "-${versionNumbers[0]}.${versionNumbers[1]}.xsd")
+				}
 			}
 		}
 	}

gradle.properties

@@ -1,2 +1,2 @@
-version=5.2.3.BUILD-SNAPSHOT
+version=5.3.0.BUILD-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=UTF-8

spring-integration-amqp/src/main/resources/META-INF/spring.schemas

@@ -1,4 +1,22 @@
-http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd
-http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd
-https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd
-https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-5.2.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-3.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.3.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-3.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-4.3.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.0.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-5.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+https\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp.xsd