Merge branch '1.10-updates'

Author: nebhale

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/applications/ReactorApplicationsV3Test.java

@@ -744,7 +744,6 @@ public void listDroplets() {
                     .lifecycle(Lifecycle.builder()
                         .type(org.cloudfoundry.client.v3.Type.BUILDPACK)
                         .data(BuildpackData.builder()
-                            .buildpack(null)
                             .stack(null)
                             .build())
                         .build())

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/GET_response.json

@@ -23,7 +23,9 @@
       "lifecycle": {
         "type": "buildpack",
         "data": {
-          "buildpack": "name-2374",
+          "buildpacks": [
+            "name-2374"
+          ],
           "stack": "name-2375"
         }
       },
@@ -73,7 +75,9 @@
       "lifecycle": {
         "type": "buildpack",
         "data": {
-          "buildpack": "name-2372",
+          "buildpacks": [
+            "name-2372"
+          ],
           "stack": "name-2373"
         }
       },

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/GET_{id}_droplets_response.json

@@ -19,7 +19,6 @@
       "lifecycle": {
         "type": "buildpack",
         "data": {
-          "buildpack": null,
           "stack": null
         }
       },
@@ -34,7 +33,9 @@
           "type": "sha1",
           "value": "0cd90dd63dd9f42db25340445d203fba25c69cf6"
         },
-        "buildpack": "ruby 1.6.14",
+        "buildpacks": [
+          "ruby 1.6.14"
+        ],
         "stack": "cflinuxfs2"
       },
       "environment_variables": {

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/GET_{id}_response.json

@@ -8,7 +8,9 @@
   "lifecycle": {
     "type": "buildpack",
     "data": {
-      "buildpack": "name-2431",
+      "buildpacks": [
+        "name-2431"
+      ],
       "stack": "name-2432"
     }
   },

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/PATCH_{id}_request.json

@@ -7,7 +7,9 @@
   "lifecycle": {
     "type": "buildpack",
     "data": {
-      "buildpack": "http://gitwheel.org/my-app",
+      "buildpacks": [
+        "http://gitwheel.org/my-app"
+      ],
       "stack": "redhat"
     }
   }

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/PATCH_{id}_response.json

@@ -8,7 +8,9 @@
   "lifecycle": {
     "type": "buildpack",
     "data": {
-      "buildpack": "http://gitwheel.org/my-app",
+      "buildpacks": [
+        "http://gitwheel.org/my-app"
+      ],
       "stack": "redhat"
     }
   },

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/POST_request.json

@@ -6,7 +6,9 @@
   "lifecycle": {
     "type": "buildpack",
     "data": {
-      "buildpack": "name-2443",
+      "buildpacks": [
+        "name-2443"
+      ],
       "stack": "name-2444"
     }
   },

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/POST_response.json

@@ -8,7 +8,9 @@
   "lifecycle": {
     "type": "buildpack",
     "data": {
-      "buildpack": "name-2443",
+      "buildpacks": [
+        "name-2443"
+      ],
       "stack": "default-stack-name"
     }
   },

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/PUT_{id}_current_droplet_response.json

@@ -8,7 +8,9 @@
   "lifecycle": {
     "type": "buildpack",
     "data": {
-      "buildpack": "name-2420",
+      "buildpacks": [
+        "name-2420"
+      ],
       "stack": "name-2421"
     }
   },

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/apps/PUT_{id}_start_response.json

@@ -8,7 +8,9 @@
   "lifecycle": {
     "type": "buildpack",
     "data": {
-      "buildpack": "name-2438",
+      "buildpacks": [
+        "name-2438"
+      ],
       "stack": "name-2439"
     }
   },