From da3868f5c39d49306544126c96a05bfe14e4e16a Mon Sep 17 00:00:00 2001 From: Petri Tuomola Date: Fri, 9 Oct 2020 22:13:13 +0300 Subject: [PATCH] FINERACT-1187: Stop appending version number to filenames --- fineract-provider/build.gradle | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 149cb490c..5972e3e5c 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -208,16 +208,18 @@ import org.apache.tools.ant.filters.ReplaceTokens task prepareInputYaml(dependsOn: 'generateGitProperties') { doLast { + def versionForSwagger + if(project.ext.properties.containsKey("gitProps")) - version = project.ext.gitProps['git.commit.id.describe'] + versionForSwagger = project.ext.gitProps['git.commit.id.describe'] else - version = "unknown" + versionForSwagger = "unknown" copy { from file('config/swagger/fineract-input.yaml.template') into file('config/swagger') rename { String filename -> return 'fineract-input.yaml' } - filter(ReplaceTokens, tokens: [VERSION: version]) + filter(ReplaceTokens, tokens: [VERSION: versionForSwagger]) } } } @@ -967,16 +969,18 @@ dependencies { task prepareConfigJson(dependsOn: 'generateGitProperties') { doLast { + def versionForSwagger + if(project.ext.properties.containsKey("gitProps")) - version = project.ext.gitProps['git.commit.id.describe'] + versionForSwagger = project.ext.gitProps['git.commit.id.describe'] else - version = "unknown" + versionForSwagger = "unknown" copy { from file('config/swagger/config.json.template') into file('config/swagger') rename { String filename -> return 'config.json' } - filter(ReplaceTokens, tokens: [VERSION: version]) + filter(ReplaceTokens, tokens: [VERSION: versionForSwagger]) } } }