@@ -728,23 +728,23 @@ def generateAttributes() {
728728 def micrometerDocsPrefix = " https://docs.micrometer.io"
729729
730730 return [
731- ' project-version' : project. version,
732- ' spring-integration-docs' : " $springDocs /spring-integration/reference" . toString(),
733- ' spring-framework-docs' : " $springDocs /spring-framework/reference/${ generateVersionWithoutPatch(springVersion)} " . toString(),
734- ' spring-retry-java-docs' : " $springDocs /spring-retry/docs/$springRetryVersion /apidocs" . toString(),
735- ' javadoc-location-org-springframework-transaction' : " $springDocs /spring-framework/docs/$springVersion /javadoc-api" . toString(),
736- ' javadoc-location-org-springframework-amqp' : " $springDocs /spring-amqp/docs/$project . version /api" . toString(),
737- ' micrometer-docs' : " $micrometerDocsPrefix /micrometer/reference/${ generateVersionWithoutPatch(micrometerVersion)} " . toString(),
738- ' micrometer-tracing-docs' : " $micrometerDocsPrefix /tracing/reference/${ generateVersionWithoutPatch(micrometerTracingVersion)} " . toString()
731+ " project-version" : project. version,
732+ " spring-integration-docs" : " $springDocs /spring-integration/reference" . toString(),
733+ " spring-framework-docs" : " $springDocs /spring-framework/reference/${ generateVersionWithoutPatch(springVersion)} " . toString(),
734+ " spring-retry-java-docs" : " $springDocs /spring-retry/docs/$springRetryVersion /apidocs" . toString(),
735+ " javadoc-location-org-springframework-transaction" : " $springDocs /spring-framework/docs/$springVersion /javadoc-api" . toString(),
736+ " javadoc-location-org-springframework-amqp" : " $springDocs /spring-amqp/docs/$project . version /api" . toString(),
737+ " micrometer-docs" : " $micrometerDocsPrefix /micrometer/reference/${ generateVersionWithoutPatch(micrometerVersion)} " . toString(),
738+ " micrometer-tracing-docs" : " $micrometerDocsPrefix /tracing/reference/${ generateVersionWithoutPatch(micrometerTracingVersion)} " . toString()
739739 ]
740740}
741741
742742static String generateVersionWithoutPatch (String version ) {
743743
744- def matcher = version =~ / ^(\d +.\d +).\d +(-SNAPSHOT)?$/
744+ def matcher = version =~ / ^(\d +.\d +).\d +(-SNAPSHOT|-M \d + )?$/
745745 if (matcher) {
746746
747- return matcher[0 ][2 ] == null
747+ return matcher[0 ][2 ] == null || matcher[ 0 ][ 2 ] . startsWith( " -M " )
748748 ? matcher[0 ][1 ]
749749 : matcher[0 ][1 ] + matcher[0 ][2 ]
750750 }
0 commit comments