Rename schema; remove duplicates from zip

* Make schema version-less.

Author: garyrussell

build.gradle

@@ -173,30 +173,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.')
-			}
-		}
-	}
-
 	publishing {
 		publications {
 			mavenJava(MavenPublication) {
@@ -270,7 +246,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'
@@ -527,6 +502,7 @@ task schemaZip(type: Zip) {
 		"XSDs for deployment at static.springframework.org/schema."
 
 	subprojects.each { subproject ->
+		def Set files = new HashSet()
 		def Properties schemas = new Properties();
 		def shortName = subproject.name.replaceFirst("${rootProject.name}-", '')
 
@@ -543,8 +519,15 @@ task schemaZip(type: Zip) {
 				it.path.replaceAll('\\\\', '/').endsWith(schemas.get(key))
 			}
 			assert xsdFile != null
-			into ("${shortName}") {
-				from xsdFile.path
+			if (!files.contains(xsdFile.path)) {
+				into ("${shortName}") {
+					from xsdFile.path
+					rename { String fileName ->
+						String[] versionNumbers = project.version.split(/\./, 3)
+						fileName.replace('.xsd', "-${versionNumbers[0]}.${versionNumbers[1]}.xsd")
+					}
+				}
+				files.add(xsdFile.path)
 			}
 		}
 	}

gradle.properties

@@ -1,3 +1,4 @@
 version=2.3.0.BUILD-SNAPSHOT
+org.gradlee.caching=true
 org.gradle.daemon=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

spring-rabbit/src/main/resources/META-INF/spring.schemas

@@ -1,4 +1,26 @@
-http\://www.springframework.org/schema/rabbit/spring-rabbit-2.2.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-2.2.xsd
-http\://www.springframework.org/schema/rabbit/spring-rabbit.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-2.2.xsd
-https\://www.springframework.org/schema/rabbit/spring-rabbit-2.2.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-2.2.xsd
-https\://www.springframework.org/schema/rabbit/spring-rabbit.xsd=org/springframework/amqp/rabbit/config/spring-rabbit-2.2.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-1.1.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-1.2.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-1.3.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-1.4.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-1.5.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-1.6.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-1.7.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-2.0.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-2.1.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-2.2.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit-2.3.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+http\://www.springframework.org/schema/rabbit/spring-rabbit.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-1.1.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-1.2.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-1.3.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-1.4.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-1.5.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-1.6.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-1.7.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-2.0.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-2.1.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-2.2.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit-2.3.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd
+https\://www.springframework.org/schema/rabbit/spring-rabbit.xsd=org/springframework/amqp/rabbit/config/spring-rabbit.xsd