Merge branch 'boot-2.2'

Signed-off-by: Ben Hale <[email protected]>

Author: nebhale

.idea/compiler.xml

@@ -22,7 +22,7 @@
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 public final class IdentityZoneBuilderTest {
 
@@ -40,7 +40,7 @@ public void augment() {
     public void augmentNotIdentityZoned() {
         IdentityZoneBuilder.augment(this.outbound, new Object());
 
-        verifyZeroInteractions(this.outbound);
+        verifyNoInteractions(this.outbound);
     }
 
     private static final class StubIdentityZoned implements IdentityZoned {

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/IdentityZoneBuilderTest.java

@@ -22,7 +22,7 @@
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 
 public final class VersionBuilderTest {
@@ -38,13 +38,13 @@ public void augment() {
     @Test
     public void augmentNotVersioned() {
         VersionBuilder.augment(this.outbound, new Object());
-        verifyZeroInteractions(this.outbound);
+        verifyNoInteractions(this.outbound);
     }
 
     @Test
     public void augmentNullVersion() {
         VersionBuilder.augment(this.outbound, new StubVersioned(null));
-        verifyZeroInteractions(this.outbound);
+        verifyNoInteractions(this.outbound);
     }
 
     private static final class StubVersioned implements Versioned {

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/VersionBuilderTest.java

@@ -136,7 +136,7 @@ public void clientV3ClientError() throws IOException {
                 assertThat(t).isInstanceOf(ClientV3Exception.class)
                     .hasMessage("CF-UnprocessableEntity(10008): something went wrong")
                     .extracting("statusCode")
-                    .containsExactly(BAD_REQUEST.code());
+                    .isEqualTo(BAD_REQUEST.code());
 
                 assertThat(((ClientV3Exception) t).getErrors()).flatExtracting(org.cloudfoundry.client.v3.Error::getCode,
                     org.cloudfoundry.client.v3.Error::getDetail,
@@ -171,7 +171,7 @@ public void clientV3ServerError() throws IOException {
                 assertThat(t).isInstanceOf(ClientV3Exception.class)
                     .hasMessage("CF-UnprocessableEntity(10008): something went wrong")
                     .extracting("statusCode")
-                    .containsExactly(INTERNAL_SERVER_ERROR.code());
+                    .isEqualTo(INTERNAL_SERVER_ERROR.code());
 
                 assertThat(((ClientV3Exception) t).getErrors()).flatExtracting(org.cloudfoundry.client.v3.Error::getCode,
                     org.cloudfoundry.client.v3.Error::getDetail,

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/util/ErrorPayloadMappersTest.java

@@ -42,7 +42,7 @@ public void test() {
         assertThat(exception)
             .hasNoCause()
             .hasMessage("test-title-1(-2): test-detail-1, test-title-2(-3): test-detail-2")
-            .extracting("statusCode").containsExactly(-1);
+            .extracting("statusCode").isEqualTo(-1);
 
         assertThat(exception.getErrors())
             .flatExtracting(Error::getCode, Error::getDetail, Error::getTitle)

cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/ClientV3ExceptionTest.java

@@ -887,7 +887,7 @@ private static Flux<LogMessage> getLogs(Mono<DopplerClient> dopplerClient, Strin
             return requestLogsStream(dopplerClient, applicationId)
                 .filter(e -> EventType.LOG_MESSAGE == e.getEventType())
                 .map(Envelope::getLogMessage)
-                .compose(SortingUtils.timespan(LOG_MESSAGE_COMPARATOR, LOG_MESSAGE_TIMESPAN));
+                .transformDeferred(SortingUtils.timespan(LOG_MESSAGE_COMPARATOR, LOG_MESSAGE_TIMESPAN));
         }
     }
 

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java

@@ -25,7 +25,7 @@
     <groupId>org.cloudfoundry</groupId>
     <artifactId>cloudfoundry-java-client</artifactId>
     <name>Cloud Foundry Java Client Parent</name>
-    <version>3.17.0.BUILD-SNAPSHOT</version>
+    <version>3.18.0.BUILD-SNAPSHOT</version>
     <packaging>pom</packaging>
     <url>https://github.com/cloudfoundry/cf-java-client</url>
 
@@ -38,7 +38,7 @@
 
     <properties>
         <commons-compress.version>1.19</commons-compress.version>
-        <dependencies.version>2.1.10.BUILD-SNAPSHOT</dependencies.version>
+        <dependencies.version>2.2.1.BUILD-SNAPSHOT</dependencies.version>
         <evo-inflector.version>1.2.2</evo-inflector.version>
         <immutables.version>2.7.4</immutables.version>
         <java-semver.version>0.9.0</java-semver.version>