Skip to content

Commit 19be6c8

Browse files
twoseattwoseat
committed
Merge branch '2.x'
2 parents 92c974b + d682a7b commit 19be6c8

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<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.7.RELEASE" level="project" />
29-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.7.RELEASE" level="project" />
28+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.1.8.RELEASE" level="project" />
29+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.8.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.7.RELEASE" level="project" />
31+
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.7.8.RELEASE" level="project" />
3232
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.24.Final" level="project" />
3333
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.24.Final" level="project" />
3434
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.24.Final" level="project" />
@@ -46,13 +46,13 @@
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" />
49-
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.16.1" level="project" />
49+
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.17" 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.6.1" level="project" />
5252
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
5353
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
5454
<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" />
55+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
5656
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
5757
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
5858
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.6.RELEASE" level="project" />

‎cloudfoundry-client/cloudfoundry-client.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />
2121
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
2222
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
23-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.7.RELEASE" level="project" />
23+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.8.RELEASE" level="project" />
2424
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
2525
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
2626
<orderEntry type="library" scope="PROVIDED" name="Maven: org.immutables:value:2.6.1" level="project" />

‎cloudfoundry-operations/cloudfoundry-operations.iml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
1717
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
1818
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
19-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.1.7.RELEASE" level="project" />
20-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.7.RELEASE" level="project" />
19+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.1.8.RELEASE" level="project" />
20+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.8.RELEASE" level="project" />
2121
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
2222
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
2323
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
@@ -26,15 +26,15 @@
2626
<orderEntry type="library" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
2727
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />
2828
<orderEntry type="module" module-name="cloudfoundry-util" />
29-
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.16.1" level="project" />
29+
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.17" level="project" />
3030
<orderEntry type="library" name="Maven: org.atteo:evo-inflector:1.2.2" level="project" />
3131
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.6.RELEASE" level="project" />
3232
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.6.RELEASE" level="project" />
3333
<orderEntry type="library" scope="PROVIDED" name="Maven: org.immutables:value:2.6.1" level="project" />
3434
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
3535
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
3636
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
37-
<orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
37+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
3838
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
3939
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.2.RELEASE" level="project" />
4040
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />

‎cloudfoundry-util/cloudfoundry-util.iml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
1515
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
1616
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
17-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.7.RELEASE" level="project" />
17+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.1.8.RELEASE" level="project" />
1818
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
19-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.1.7.RELEASE" level="project" />
19+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.1.8.RELEASE" level="project" />
2020
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
2121
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
22-
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.16.1" level="project" />
23-
<orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
22+
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.17" level="project" />
2423
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
2524
<orderEntry type="library" name="Maven: org.atteo:evo-inflector:1.2.2" level="project" />
2625
<orderEntry type="module" module-name="cloudfoundry-client" />
@@ -30,6 +29,7 @@
3029
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
3130
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
3231
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
32+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
3333
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.6.RELEASE" level="project" />
3434
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.6.RELEASE" level="project" />
3535
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.2.RELEASE" level="project" />

‎integration-test/integration-test.iml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,20 @@
1616
<orderEntry type="inheritedJdk" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
<orderEntry type="library" scope="TEST" name="Maven: com.github.zafarkhaja:java-semver:0.9.0" level="project" />
19-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.1.7.RELEASE" level="project" />
20-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-core:3.1.7.RELEASE" level="project" />
19+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.1.8.RELEASE" level="project" />
20+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-core:3.1.8.RELEASE" level="project" />
2121
<orderEntry type="library" scope="TEST" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
2222
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
2323
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
24-
<orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-compress:1.16.1" level="project" />
25-
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
24+
<orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-compress:1.17" level="project" />
2625
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
2726
<orderEntry type="module" module-name="cloudfoundry-client-reactor" scope="TEST" />
2827
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.5" level="project" />
2928
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
3029
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.5" level="project" />
3130
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.5" level="project" />
3231
<orderEntry type="library" scope="TEST" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
33-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-netty:0.7.7.RELEASE" level="project" />
32+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-netty:0.7.8.RELEASE" level="project" />
3433
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.1.24.Final" level="project" />
3534
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.1.24.Final" level="project" />
3635
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.1.24.Final" level="project" />
@@ -79,6 +78,7 @@
7978
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
8079
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
8180
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
81+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
8282
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
8383
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
8484
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
</modules>
4545

4646
<properties>
47-
<commons-compress.version>1.16.1</commons-compress.version>
47+
<commons-compress.version>1.17</commons-compress.version>
4848
<evo-inflector.version>1.2.2</evo-inflector.version>
4949
<immutables.version>2.6.1</immutables.version>
5050
<java-semver.version>0.9.0</java-semver.version>
5151
<jjwt.version>0.9.0</jjwt.version>
5252
<okhttp3.version>3.10.0</okhttp3.version>
5353
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
54-
<reactor-core.version>3.1.7.RELEASE</reactor-core.version>
55-
<reactor-netty.version>0.7.7.RELEASE</reactor-netty.version>
54+
<reactor-core.version>3.1.8.RELEASE</reactor-core.version>
55+
<reactor-netty.version>0.7.8.RELEASE</reactor-netty.version>
5656
<wire.version>2.2.0</wire.version>
5757
</properties>
5858

0 commit comments

Comments
 (0)