Skip to content

Commit 623ac9c

Browse files
nebhalenebhale
committed
Merge branch '2.x'
2 parents 5a997d7 + 3127fd5 commit 623ac9c

File tree

15 files changed

+187
-167
lines changed

15 files changed

+187
-167
lines changed

‎.idea/compiler.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
| Job | 3.x Status | 2.x Status
1616
| --- | ---------- | ----------
1717
| `unit-test` | [![unit-test-master](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/unit-test-master/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/unit-test-master) | [![unit-test-2.x](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/unit-test-2.x/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/unit-test-2.x)
18-
| `integration-test-1.10` | [![unit-test-master](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/integration-test-1.10-master/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/integration-test-1.10-master) | [![unit-test-2.x](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/integration-test-1.10-2.x/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/integration-test-1.10-2.x)
19-
| `integration-test-1.11` | [![unit-test-master](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/integration-test-1.11-master/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/integration-test-1.11-master) | [![unit-test-2.x](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/integration-test-1.11-2.x/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/integration-test-1.11-2.x)
2018
| `integration-test-1.12` | [![unit-test-master](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/integration-test-1.12-master/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/integration-test-1.12-master) | [![unit-test-2.x](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/integration-test-1.12-2.x/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/integration-test-1.12-2.x)
2119
| `integration-test-2.0` | [![unit-test-master](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/integration-test-2.0-master/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/integration-test-2.0-master) | [![unit-test-2.x](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/integration-test-2.0-2.x/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/integration-test-2.0-2.x)
20+
| `integration-test-2.1` | [![unit-test-master](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/integration-test-2.1-master/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/integration-test-2.1-master) | [![unit-test-2.x](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/integration-test-2.1-2.x/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/integration-test-2.1-2.x)
2221
| `deploy` | [![deploy-master](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/deploy-master/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/deploy-master) | [![deploy-2.x](https://java-experience.ci.springapps.io/api/v1/teams/java-experience/pipelines/java-client/jobs/deploy-2.x/badge)](https://java-experience.ci.springapps.io/teams/java-experience/pipelines/java-client/jobs/deploy-2.x)
2322

2423

@@ -36,22 +35,22 @@ Most projects will need two dependencies; the Operations API and an implementati
3635
<dependency>
3736
<groupId>org.cloudfoundry</groupId>
3837
<artifactId>cloudfoundry-client-reactor</artifactId>
39-
<version>3.5.0.RELEASE</version>
38+
<version>3.9.0.RELEASE</version>
4039
</dependency>
4140
<dependency>
4241
<groupId>org.cloudfoundry</groupId>
4342
<artifactId>cloudfoundry-operations</artifactId>
44-
<version>3.5.0.RELEASE</version>
43+
<version>3.9.0.RELEASE</version>
4544
</dependency>
4645
<dependency>
4746
<groupId>io.projectreactor</groupId>
4847
<artifactId>reactor-core</artifactId>
49-
<version>3.1.5.RELEASE</version>
48+
<version>3.1.7.RELEASE</version>
5049
</dependency>
5150
<dependency>
5251
<groupId>io.projectreactor.ipc</groupId>
5352
<artifactId>reactor-netty</artifactId>
54-
<version>0.7.5.RELEASE</version>
53+
<version>0.7.7.RELEASE</version>
5554
</dependency>
5655
...
5756
</dependencies>
@@ -77,10 +76,10 @@ For Gradle, the dependencies would be defined like this:
7776

7877
```groovy
7978
dependencies {
80-
compile 'org.cloudfoundry:cloudfoundry-client-reactor:3.5.0.RELEASE'
81-
compile 'org.cloudfoundry:cloudfoundry-operations:3.5.0.RELEASE'
82-
compile 'io.projectreactor:reactor-core:3.1.5.RELEASE'
83-
compile 'io.projectreactor.ipc:reactor-netty:0.7.5.RELEASE'
79+
compile 'org.cloudfoundry:cloudfoundry-client-reactor:3.9.0.RELEASE'
80+
compile 'org.cloudfoundry:cloudfoundry-operations:3.9.0.RELEASE'
81+
compile 'io.projectreactor:reactor-core:3.1.7.RELEASE'
82+
compile 'io.projectreactor.ipc:reactor-netty:0.7.7.RELEASE'
8483
...
8584
}
8685
```

‎cloudfoundry-client-reactor/cloudfoundry-client-reactor.iml‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,55 @@
1313
</content>
1414
<orderEntry type="inheritedJdk" />
1515
<orderEntry type="sourceFolder" forTests="false" />
16-
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.11" level="project" />
17-
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.11" level="project" />
18-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.10" level="project" />
19-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
20-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.10" level="project" />
21-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.10" level="project" />
16+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
17+
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
18+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
19+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
20+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
21+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.5" level="project" />
2222
<orderEntry type="library" name="Maven: com.github.zafarkhaja:java-semver:0.9.0" level="project" />
23-
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:mockwebserver:3.6.0" level="project" />
24-
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:okhttp:3.6.0" level="project" />
25-
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.11.0" level="project" />
23+
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:mockwebserver:3.10.0" level="project" />
24+
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
25+
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
2626
<orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk15on:1.50" level="project" />
2727
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
28-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.1.5.RELEASE" level="project" />
29-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.5.RELEASE" level="project" />
28+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.1.7.RELEASE" level="project" />
29+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.7.RELEASE" level="project" />
3030
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
31-
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.7.5.RELEASE" level="project" />
32-
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.22.Final" level="project" />
33-
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.22.Final" level="project" />
34-
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.22.Final" level="project" />
35-
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.22.Final" level="project" />
36-
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.22.Final" level="project" />
37-
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.22.Final" level="project" />
38-
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.22.Final" level="project" />
39-
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.22.Final" level="project" />
40-
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.22.Final" level="project" />
41-
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.22.Final" level="project" />
42-
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.22.Final" level="project" />
31+
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.7.7.RELEASE" level="project" />
32+
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.24.Final" level="project" />
33+
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.24.Final" level="project" />
34+
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.24.Final" level="project" />
35+
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.24.Final" level="project" />
36+
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.24.Final" level="project" />
37+
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.24.Final" level="project" />
38+
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.24.Final" level="project" />
39+
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.24.Final" level="project" />
40+
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.24.Final" level="project" />
41+
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.24.Final" level="project" />
42+
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.24.Final" level="project" />
4343
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
4444
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
45-
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.0" level="project" />
45+
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
4646
<orderEntry type="module" module-name="cloudfoundry-client" />
4747
<orderEntry type="library" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
4848
<orderEntry type="module" module-name="cloudfoundry-util" />
4949
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.16.1" level="project" />
5050
<orderEntry type="library" name="Maven: org.atteo:evo-inflector:1.2.2" level="project" />
5151
<orderEntry type="library" scope="PROVIDED" name="Maven: org.immutables:value:2.5.6" level="project" />
52-
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
53-
<orderEntry type="library" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
52+
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
53+
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
54+
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
55+
<orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
5456
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
5557
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
56-
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.14.RELEASE" level="project" />
57-
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:4.3.14.RELEASE" level="project" />
58-
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.14.RELEASE" level="project" />
59-
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.5.10.RELEASE" level="project" />
58+
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.6.RELEASE" level="project" />
59+
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.6.RELEASE" level="project" />
60+
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.6.RELEASE" level="project" />
61+
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.6.RELEASE" level="project" />
62+
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.2.RELEASE" level="project" />
63+
<orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
64+
<orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
6065
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
61-
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
6266
</component>
6367
</module>

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/servicebindings/ReactorServiceBindingsV3Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public void get() {
165165
public void list() {
166166
mockRequest(InteractionContext.builder()
167167
.request(TestRequest.builder()
168-
.method(GET).path("/service_bindings?app_guids=test-application-id&order_by=%2Bcreated_at&page=1")
168+
.method(GET).path("/service_bindings?app_guids=test-application-id&order_by=+created_at&page=1")
169169
.build())
170170
.response(TestResponse.builder()
171171
.status(OK)

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/UsernameProviderTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@
3636
import java.time.Duration;
3737
import java.time.Instant;
3838
import java.util.Map;
39-
import java.util.concurrent.TimeoutException;
4039

41-
import static org.mockito.Matchers.any;
40+
import static org.mockito.ArgumentMatchers.any;
4241
import static org.mockito.Mockito.mock;
4342
import static org.mockito.Mockito.verify;
4443
import static org.mockito.Mockito.when;

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/clients/ReactorClientsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ public void getMetadata() {
553553
public void list() {
554554
mockRequest(InteractionContext.builder()
555555
.request(TestRequest.builder()
556-
.method(GET).path("/oauth/clients?count=10&filter=client_id%2Beq%2B%22EGgNW3%22&sortBy=client_id&sortOrder=descending&startIndex=1")
556+
.method(GET).path("/oauth/clients?count=10&filter=client_id+eq+%22EGgNW3%22&sortBy=client_id&sortOrder=descending&startIndex=1")
557557
.build())
558558
.response(TestResponse.builder()
559559
.status(OK)

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/groups/ReactorGroupsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public void list() {
261261
mockRequest(InteractionContext.builder()
262262
.request(TestRequest.builder()
263263
.method(GET)
264-
.path("/Groups?count=50&filter=id%2Beq%2B%22f87c557a-8ddc-43d3-98fb-e420ebc7f0f1%22%2Bor%2BdisplayName%2Beq%2B%22Cooler%20Group%20Name%20for%20List%22" +
264+
.path("/Groups?count=50&filter=id+eq+%22f87c557a-8ddc-43d3-98fb-e420ebc7f0f1%22+or+displayName+eq+%22Cooler%20Group%20Name%20for%20List%22" +
265265
"&sortBy=email&sortOrder=ascending&startIndex=1")
266266
.build())
267267
.response(TestResponse.builder()
@@ -312,7 +312,7 @@ public void listExternalGroupMappings() {
312312
mockRequest(InteractionContext.builder()
313313
.request(TestRequest.builder()
314314
.method(GET)
315-
.path("/Groups/External?count=50&filter=group_id%2Beq%2B%220480db7f-d1bc-4d2b-b723-febc684c0ee9%22&startIndex=1")
315+
.path("/Groups/External?count=50&filter=group_id+eq+%220480db7f-d1bc-4d2b-b723-febc684c0ee9%22&startIndex=1")
316316
.build())
317317
.response(TestResponse.builder()
318318
.status(OK)

‎cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/users/ReactorUsersTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ public void list() {
456456
mockRequest(InteractionContext.builder()
457457
.request(TestRequest.builder()
458458
.method(GET).path(
459-
"/Users?count=50&filter=id%2Beq%2B%22a94534d5-de08-41eb-8712-a51314e6a484%22%2Bor%2Bemail%2Beq%2B%22Da63pG@test.org%22&sortBy=email&sortOrder=ascending&startIndex=1")
459+
"/Users?count=50&filter=id+eq+%22a94534d5-de08-41eb-8712-a51314e6a484%22+or+email+eq+%22Da63pG@test.org%22&sortBy=email&sortOrder=ascending&startIndex=1")
460460
.build())
461461
.response(TestResponse.builder()
462462
.status(OK)
@@ -585,7 +585,7 @@ public void lookup() {
585585
mockRequest(InteractionContext.builder()
586586
.request(TestRequest.builder()
587587
.method(GET).path(
588-
"/ids/Users?count=10&filter=userName%2Beq%2B%22bobOu38vE@test.org%22%2Bor%2Bid%2Beq%2B%22c1476587-5ec9-4b7e-9ed2-381e3133f07a%22" +
588+
"/ids/Users?count=10&filter=userName+eq+%22bobOu38vE@test.org%22+or+id+eq+%22c1476587-5ec9-4b7e-9ed2-381e3133f07a%22" +
589589
"&includeInactive=true&sortOrder=descending&startIndex=1")
590590
.build())
591591
.response(TestResponse.builder()

0 commit comments

Comments
 (0)