Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Phillip Webb
2019-08-30 19:16:19 -07:00
parent dc870044c6 348d65b4fe
commit f69b2669b3
5 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-docs/pom.xml
View File

@@ -1451,7 +1451,7 @@
</resource>
</resources>
<attributes>
<spring-boot-repo>${spring-boot-repo}</spring-boot-repo>
<spring-boot-artifactory-repo>${spring-boot-artifactory-repo}</spring-boot-artifactory-repo>
<github-tag>${github-tag}</github-tag>
<sources-root>${project.basedir}/src</sources-root>
<asciidoc-sources-root>${project.basedir}/src/main/asciidoc</asciidoc-sources-root>
@@ -1613,7 +1613,7 @@
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="spring-boot-repo">
<stringutil string="${version-type}" property="spring-boot-artifactory-repo">
<lowercase />
</stringutil>
<var name="github-tag" value="v${revision}" />