Merge branch 'dev'

* dev:
  Rename hotfix to patch, part 2
  Rename hotfix to patch
  OLMIS-60 Add version number to login page
  Fix database build dependency
  bumping commons-collections to 3.2.2 and 4.1 due to security notification

Author: joshzamor

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',

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)

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])
+        }
     }
 }
 

modules/openlmis-web/src/main/webapp/public/pages/login-form.html

@@ -41,7 +41,7 @@ <h2 id="signInLabel" openlmis-message="label.sign.in"></h2>
         </form>
     </div>
     <div class="powered-by">
-        Powered by <a href="http://openlmis.org" target="_blank">OpenLMIS</a>
+        Powered by <a href="http://openlmis.org" target="_blank">OpenLMIS</a> v@major_version@.@minor_version@.@patch_version@ build @build_version@
     </div>
 </div>
 

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')
 

version.properties

@@ -0,0 +1,4 @@
+majorVersion = 2
+minorVersion = 0
+patchVersion = 1
+buildVersion = Developer