diff --git a/build.gradle b/build.gradle index 11c9c877c6..4f1cf093e6 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,11 @@ apply plugin: 'com.github.ben-manes.versions' apply plugin: 'properties' apply plugin: 'sonar-runner' +ext.versionProps = new Properties() +versionProps.load(new FileInputStream("version.properties")) +versionProps.each { versionProp -> + ext.set(versionProp.key, versionProp.value) +} idea.project.languageLevel = '1.7' idea.project.jdkName = '1.7' @@ -95,8 +100,8 @@ subprojects { 'org.springframework.integration:spring-integration-ftp:4.1.2.RELEASE', 'xml-apis:xml-apis:2.0.2', - 'commons-collections:commons-collections:3.2.1', - 'org.apache.commons:commons-collections4:4.0', + 'commons-collections:commons-collections:3.2.2', + 'org.apache.commons:commons-collections4:4.1', 'javax.servlet:javax.servlet-api:3.1.0', 'org.projectlombok:lombok:1.16.2', diff --git a/modules/db/build.gradle b/modules/db/build.gradle index bdb0185eb0..023c17201a 100644 --- a/modules/db/build.gradle +++ b/modules/db/build.gradle @@ -138,7 +138,7 @@ task globalSeed(dependsOn: [baseSeed, extraSeed]) { description 'Runs all seed tasks that apply globally' } -task enableCustom(type: Exec, dependsOn: globalSeed) { +task enableCustom(type: Exec, dependsOn: baseSeed) { onlyIf { toggleOnCustom == 'true' } description 'Runs script to enable project-specific features (if toggleOnCustom is true)' environment("PGPASSWORD", dbPassword) diff --git a/modules/openlmis-web/build.gradle b/modules/openlmis-web/build.gradle index bb0643fac4..9ee8e5fe99 100644 --- a/modules/openlmis-web/build.gradle +++ b/modules/openlmis-web/build.gradle @@ -141,6 +141,12 @@ tasks.withType(War) { else "$line" } + if (fileCopy.name.equals('login-form.html')) { + fileCopy.filter(ReplaceTokens, tokens: [major_version: majorVersion, + minor_version: minorVersion, + patch_version: patchVersion, + build_version: buildVersion]) + } } } diff --git a/modules/openlmis-web/src/main/webapp/public/pages/login-form.html b/modules/openlmis-web/src/main/webapp/public/pages/login-form.html index 1c1a8b0d17..91254d0ff8 100644 --- a/modules/openlmis-web/src/main/webapp/public/pages/login-form.html +++ b/modules/openlmis-web/src/main/webapp/public/pages/login-form.html @@ -41,7 +41,7 @@

- Powered by OpenLMIS + Powered by OpenLMIS v@major_version@.@minor_version@.@patch_version@ build @build_version@
diff --git a/modules/sms/build.gradle b/modules/sms/build.gradle index 184d3bc38d..32733371a6 100644 --- a/modules/sms/build.gradle +++ b/modules/sms/build.gradle @@ -17,7 +17,7 @@ dependencies { compile 'javax.activation:activation:1.1.1', 'org.springframework.integration:spring-integration-core:4.1.2.RELEASE', 'org.springframework.integration:spring-integration-jdbc:4.1.2.RELEASE', - 'commons-collections:commons-collections:3.2.1', + 'commons-collections:commons-collections:3.2.2', 'commons-lang:commons-lang:2.6', project(':modules:db') diff --git a/version.properties b/version.properties new file mode 100644 index 0000000000..bfb5b4c9f4 --- /dev/null +++ b/version.properties @@ -0,0 +1,4 @@ +majorVersion = 2 +minorVersion = 0 +patchVersion = 1 +buildVersion = Developer \ No newline at end of file