Polish antora file and simplify version method

Signed-off-by: Tran Ngoc Nhan <[email protected]>

Author: ngocnhan-tran1996

build.gradle

@@ -728,26 +728,18 @@ def generateAttributes() {
 	def micrometerDocsPrefix = "https://docs.micrometer.io"
 
 	return [
-		"project-version": project.version,
-		"spring-integration-docs": "$springDocs/spring-integration/reference".toString(),
-		"spring-framework-docs": "$springDocs/spring-framework/reference/${generateVersionWithoutPatch(springVersion)}".toString(),
-		"spring-retry-java-docs": "$springDocs/spring-retry/docs/$springRetryVersion/apidocs".toString(),
-		"javadoc-location-org-springframework-transaction": "$springDocs/spring-framework/docs/$springVersion/javadoc-api".toString(),
-		"javadoc-location-org-springframework-amqp": "$springDocs/spring-amqp/docs/$project.version/api".toString(),
-		"micrometer-docs": "$micrometerDocsPrefix/micrometer/reference/${generateVersionWithoutPatch(micrometerVersion)}".toString(),
-		"micrometer-tracing-docs": "$micrometerDocsPrefix/tracing/reference/${generateVersionWithoutPatch(micrometerTracingVersion)}".toString()
+		'project-version': project.version,
+		'spring-integration-docs': "$springDocs/spring-integration/reference".toString(),
+		'spring-framework-docs': "$springDocs/spring-framework/reference/${generateVersionWithoutPatch(springVersion)}".toString(),
+		'spring-retry-java-docs': "$springDocs/spring-retry/docs/$springRetryVersion/apidocs".toString(),
+		'javadoc-location-org-springframework-transaction': "$springDocs/spring-framework/docs/$springVersion/javadoc-api".toString(),
+		'javadoc-location-org-springframework-amqp': "$springDocs/spring-amqp/docs/$project.version/api".toString(),
+		'micrometer-docs': "$micrometerDocsPrefix/micrometer/reference/${generateVersionWithoutPatch(micrometerVersion)}".toString(),
+		'micrometer-tracing-docs': "$micrometerDocsPrefix/tracing/reference/${generateVersionWithoutPatch(micrometerTracingVersion)}".toString()
 	]
 }
 
 static String generateVersionWithoutPatch(String version) {
 
-	def matcher = version =~ /^(\d+.\d+).\d+(-SNAPSHOT|-M\d+)?$/
-	if(matcher) {
-
-		return matcher[0][2] == null || matcher[0][2].startsWith("-M")
-			? matcher[0][1]
-			: matcher[0][1] + matcher[0][2]
-	}
-
-	return version
+	return version.split('\\.')[0,1].join('.') + (version.endsWith('-SNAPSHOT') ? '-SNAPSHOT' : '')
 }

src/reference/antora/antora.yml

@@ -18,4 +18,4 @@ asciidoc:
     # External projects URLs and related attributes
     rabbitmq-stream-docs: 'https://rabbitmq.github.io/rabbitmq-stream-java-client/stable/htmlsingle'
     rabbitmq-github: 'https://github.com/rabbitmq'
-    rabbitmq-server-github: '{rabbitmq-github}/rabbitmq-server/tree/main/deps'
+    rabbitmq-server-github: '{rabbitmq-github}/rabbitmq-server/tree/main/deps'