Merge pull request #35 from dpinto-pivotal/versionManifests

Automatically generate manifest files with correct version. Closes #34

build.gradle

@@ -46,7 +46,18 @@ subprojects {
 	println version
 
 	test { finalizedBy jacocoTestReport }
+
+	task manifestFilter(type: Copy) {
+		from 'manifest-unversioned.yml'
+		into "${buildDir}/"
+		rename { String fileName ->
+			fileName.replace('-unversioned', '')
+		}
+		expand(version: "${version}")
+	}
 
+	assemble { finalizedBy manifestFilter }
+
 	jacocoTestReport {
 		group = "Reporting"
 		description = "Generate Jacoco coverage reports after running tests."

docs/lab_pushquote.md

@@ -22,6 +22,8 @@ Luckily, Pivotal Cloud Foundry allows us to assign a [`random-route`](http://doc
 
   > HINT: user the -f option to the push command.
 
+  > Manifest files are generated as part of the build. They are placed in `springboottrades-quotes/build`
+
 2. When the script has finished, set the `CF_TARGET` environment variable in both applications to the API endpoint of your Elastic Runtime instance (as in `https://api.example.com`), then restage the applications so that the changes will take effect.
 
   ```

gradle/versioning.gradle

@@ -10,9 +10,9 @@ class ProjectVersion {
 	ProjectVersion() {
                 def file = new File('version/number')
                 if(file.exists()) {
-                   this.build = file.text
+                   this.build = file.text.trim()
                 } else {
-                    this.build = "0.0.0"
+                    this.build = "0.3.0"
                 }
 	}
 	@Override

manifest-account.yml → springboottrades-accounts/manifest-unversioned.yml

@@ -10,5 +10,5 @@ env:
 applications:
 - name: accounts
   random-route: true
-  path: springboottrades-accounts/build/libs/accounts-0.3.jar
+  path: springboottrades-accounts/build/libs/accounts-${version}.jar
   services: [ traderdb, discovery-service, circuit-breaker-dashboard, config-server ]

manifest-portfolio.yml → springboottrades-portfolio/manifest-unversioned.yml

@@ -10,5 +10,5 @@ env:
 applications:
 - name: portfolio
   random-route: true
-  path: springboottrades-portfolio/build/libs/portfolio-0.3.jar
+  path: springboottrades-portfolio/build/libs/portfolio-${version}.jar
   services: [ traderdb, discovery-service, circuit-breaker-dashboard, config-server ]

manifest-quotes.yml → springboottrades-quotes/manifest-unversioned.yml

@@ -10,5 +10,5 @@ env:
 applications:
 - name: quotes
   random-route: true
-  path: springboottrades-quotes/build/libs/quotes-0.3.jar
+  path: springboottrades-quotes/build/libs/quotes-${version}.jar
   services: [ discovery-service, circuit-breaker-dashboard, config-server ]

manifest-web.yml → springboottrades-web/manifest-unversioned.yml

@@ -10,5 +10,5 @@ env:
 applications:
 - name: webtrader
   random-route: true
-  path: springboottrades-web/build/libs/web-0.3.jar
+  path: springboottrades-web/build/libs/web-${version}.jar
   services: [ discovery-service, circuit-breaker-dashboard, config-server ]