Merge remote-tracking branch 'refs/remotes/IBM-Bluemix/master'

lzdanski · lzdanski · commit a1f70f11c4b1 · 2017-08-25T10:43:15.000-04:00
diff --git a/manifest.yml b/manifest.yml
@@ -3,5 +3,5 @@ applications:
  - name: GetStartedJava
    random-route: true
    path: target/GetStartedJava.war
-   memory: 512M
+   memory: 256M
    instances: 1
diff --git a/pom.xml b/pom.xml
@@ -69,6 +69,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
+                    <version>2.6</version>
                     <configuration>
                         <failOnMissingWebXml>false</failOnMissingWebXml>
                         <warName>GetStartedJava</warName>
