Merge branch '982-dev-upgrade'

Author: twoseat

.gitignore

@@ -1,4 +1,9 @@
 .idea/libraries
 .idea/tasks.xml
 .idea/workspace.xml
-target
+target/
+bin/
+.project
+.classpath
+.settings/
+.factorypath

README.md

@@ -254,13 +254,15 @@ The above example is more complicated:
 1. `.map(...)` – Maps the `Resource` to an `OrganizationSummary` type.
 
 ## Development
-The project depends on Java 8.  To build from source and install to your local Maven cache, run the following:
+The project depends on Java 8. To build from source and install to your local Maven cache, run the following:
 
 ```shell
 $ git submodule update --init --recursive
 $ ./mvnw clean install
 ```
 
+It also depends on [Immutables](https://immutables.github.io/) and won't compile in IDEs like Eclipse or IntelliJ unless you also have an enabled annotation processor. See [this guide](https://immutables.github.io/apt.html) for instructions on how to configure your IDE.
+
 To run the integration tests, run the following:
 
 ```shell

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/applications/ReactorApplicationsV2Test.java

@@ -1002,10 +1002,10 @@ public void upload() throws IOException {
                             "{\"sha1\":\"ff84f89760317996b9dd180ab996b079f418396f\",\"fn\":\"path/to/code.jar\",\"size\":123}]" +
                             "\r\n" + "--" + boundary + "\r\n" +
                             "content-disposition: form-data; name=\"application\"; filename=\"application.zip\"\r\n" +
-                            "content-length: 13\r\n" +
+                            "content-length: 12\r\n" +
                             "content-type: application/zip\r\n" +
                             "\r\n" +
-                            "test-content\n" +
+                            "test-content" +
                             "\r\n" +
                             "--" + boundary + "--");
                 }))
@@ -1058,9 +1058,9 @@ public void uploadDroplet() throws IOException {
                     assertThat(body.readString(Charset.defaultCharset()))
                         .isEqualTo("\r\n" + "--" + boundary + "\r\n" +
                             "content-disposition: form-data; name=\"droplet\"; filename=\"test-droplet.tgz\"\r\n" +
-                            "content-length: 13\r\n" +
+                            "content-length: 12\r\n" +
                             "\r\n" +
-                            "test-content\n" +
+                            "test-content" +
                             "\r\n" +
                             "--" + boundary + "--");
                 }))

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v2/buildpacks/ReactorBuildpacksTest.java

@@ -280,10 +280,10 @@ public void upload() throws IOException {
                     assertThat(body.readString(Charset.defaultCharset()))
                         .isEqualTo("\r\n--" + boundary + "\r\n" +
                             "content-disposition: form-data; name=\"buildpack\"; filename=\"test-filename\"\r\n" +
-                            "content-length: 13\r\n" +
+                            "content-length: 12\r\n" +
                             "content-type: application/zip\r\n" +
                             "\r\n" +
-                            "test-content\n" +
+                            "test-content" +
                             "\r\n" +
                             "--" + boundary + "--");
                 }))

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/packages/ReactorPackagesTest.java

@@ -471,10 +471,10 @@ public void upload() throws IOException {
                     assertThat(body.readString(Charset.defaultCharset()))
                         .isEqualTo("\r\n--" + boundary + "\r\n" +
                             "content-disposition: form-data; name=\"bits\"; filename=\"application.zip\"\r\n" +
-                            "content-length: 13\r\n" +
+                            "content-length: 12\r\n" +
                             "content-type: application/zip\r\n" +
                             "\r\n" +
-                            "test-content\n" +
+                            "test-content" +
                             "\r\n" +
                             "--" + boundary + "--");
                 }))

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v2/apps/test-application.zip

@@ -1 +1 @@
-test-content
+test-content

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v2/apps/test-droplet.tgz

@@ -1 +1 @@
-test-content
+test-content

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v2/buildpacks/test-buildpack.zip

@@ -1 +1 @@
-test-content
+test-content

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/packages/test-package.zip

@@ -1 +1 @@
-test-content
+test-content

cloudfoundry-operations/pom.xml

@@ -91,6 +91,11 @@
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>