Skip to content

S
spring-boot
Commit 595cb6d5 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Fix version-type logic to deal with RCx form

parent f500e48e
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
pom.xml
View file @ 595cb6d5
...@@ -99,9 +99,11 @@ ...@@ -99,9 +99,11 @@
<propertyregex property="version-type" override="true" <propertyregex property="version-type" override="true"
input="${version-type}" regexp=".*\.(.*)" replace="\1" /> input="${version-type}" regexp=".*\.(.*)" replace="\1" />
<propertyregex property="version-type" override="true" <propertyregex property="version-type" override="true"
input="${version-type}" regexp="(M)\d+" replace="\1ILESTONE" /> input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
<propertyregex property="version-type" override="true" <propertyregex property="version-type" override="true"
input="${version-type}" regexp="BUILD-(.*)" replace="\1" /> input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
<propertyregex property="version-type" override="true"
input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
<stringutil string="${version-type}" property="profile"> <stringutil string="${version-type}" property="profile">
<lowercase /> <lowercase />
</stringutil> </stringutil>
......
spring-boot-cli/pom.xml
View file @ 595cb6d5
...@@ -301,9 +301,11 @@ ...@@ -301,9 +301,11 @@
<propertyregex property="version-type" override="true" <propertyregex property="version-type" override="true"
input="${version-type}" regexp=".*\.(.*)" replace="\1" /> input="${version-type}" regexp=".*\.(.*)" replace="\1" />
<propertyregex property="version-type" override="true" <propertyregex property="version-type" override="true"
input="${version-type}" regexp="(M)\d+" replace="\1ILESTONE" /> input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
<propertyregex property="version-type" override="true" <propertyregex property="version-type" override="true"
input="${version-type}" regexp="BUILD-(.*)" replace="\1" /> input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
<propertyregex property="version-type" override="true"
input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
<stringutil string="${version-type}" property="repo"> <stringutil string="${version-type}" property="repo">
<lowercase /> <lowercase />
</stringutil> </stringutil>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment