Skip to content

Commit 9f897be

Browse files
Update version for milestone
Signed-off-by: Tran Ngoc Nhan <[email protected]>
1 parent f7cbc98 commit 9f897be

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -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

742742
static 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

Comments
 (0)