Merge pull request #1220 from anthonydahanne/enhance-deploy

Enhance deploy

Author: pivotal-david-osullivan

ci/deploy.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -euo pipefail
+set -euox pipefail
 
 [[ -d $PWD/maven && ! -d $HOME/.m2 ]] && ln -s $PWD/maven $HOME/.m2
 
@@ -28,4 +28,4 @@ cat <<EOF > ~/.m2/settings.xml
 EOF
 
 cd cf-java-client
-./mvnw -q -Dmaven.test.skip=true deploy
+./mvnw -Dmaven.test.skip=true deploy

ci/tcp-routes.yml

@@ -18,13 +18,10 @@
 - type: replace
   path: /resource-config/tcp_router/instances
   value: automatic
+- type: replace
+  path: /resource-config/compute/instances
+  value: 2
 - type: replace
   path: /product-properties/.cloud_controller.default_quota_memory_limit_mb
   value:
     value: ((DEFAULT_QUOTA_MEM_MB))
-- type: replace
-  path: /resource-config/compute/instances
-  value: 4
-- type: replace
-  path: /resource-config/compute/instance_type/id
-  value: "2xlarge.mem"

cloudfoundry-client-reactor/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.12.0.BUILD-SNAPSHOT</version>
+        <version>5.11.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-client-reactor</artifactId>

cloudfoundry-client/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.12.0.BUILD-SNAPSHOT</version>
+        <version>5.11.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-client</artifactId>

cloudfoundry-operations/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.12.0.BUILD-SNAPSHOT</version>
+        <version>5.11.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-operations</artifactId>

cloudfoundry-util/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.12.0.BUILD-SNAPSHOT</version>
+        <version>5.11.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-util</artifactId>

integration-test/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.12.0.BUILD-SNAPSHOT</version>
+        <version>5.11.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>integration-test</artifactId>

pom.xml

@@ -23,7 +23,7 @@
     <artifactId>cloudfoundry-java-client</artifactId>
     <name>Cloud Foundry Java Client Parent</name>
     <description>A Java language binding for interacting with a Cloud Foundry instance</description>
-    <version>5.12.0.BUILD-SNAPSHOT</version>
+    <version>5.11.0.BUILD-SNAPSHOT</version>
     <packaging>pom</packaging>
     <url>https://github.com/cloudfoundry/cf-java-client</url>
 

test-log-cache/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.12.0.BUILD-SNAPSHOT</version>
+        <version>5.11.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>test-log-cache</artifactId>

test-service-broker/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.12.0.BUILD-SNAPSHOT</version>
+        <version>5.11.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>test-service-broker</artifactId>