Skip to content

Commit d682a7b

Browse files
twoseattwoseat
committed
Merge branch 'version-updates' into 2.x
2 parents 72a9705 + 35d0a8e commit d682a7b

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc:0.6.2.RELEASE" level="project" />
4545
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
4646
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
47-
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
47+
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.10.0" level="project" />
4848
<orderEntry type="module" module-name="cloudfoundry-client" />
4949
<orderEntry type="library" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
5050
<orderEntry type="module" module-name="cloudfoundry-util" />
51-
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.16.1" level="project" />
51+
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.17" level="project" />
5252
<orderEntry type="library" name="Maven: org.atteo:evo-inflector:1.2.2" level="project" />
5353
<orderEntry type="library" scope="PROVIDED" name="Maven: org.immutables:value:2.6.1" level="project" />
5454
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
55-
<orderEntry type="library" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
55+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.5.1" 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:4.3.17.RELEASE" level="project" />

‎cloudfoundry-client/cloudfoundry-client.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
2323
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.7.RELEASE" level="project" />
2424
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
25-
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
25+
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.10.0" level="project" />
2626
<orderEntry type="library" scope="PROVIDED" name="Maven: org.immutables:value:2.6.1" level="project" />
2727
</component>
2828
</module>

‎cloudfoundry-operations/cloudfoundry-operations.iml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
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" />
24-
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
24+
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.10.0" level="project" />
2525
<orderEntry type="module" module-name="cloudfoundry-client" />
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:4.3.17.RELEASE" level="project" />
3232
<orderEntry type="library" scope="PROVIDED" name="Maven: org.immutables:value:2.6.1" level="project" />
3333
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
34-
<orderEntry type="library" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
34+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
3535
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
3636
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.5.13.RELEASE" level="project" />
3737
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.11" level="project" />

‎cloudfoundry-util/cloudfoundry-util.iml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.addons:reactor-test:3.0.7.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.5.1" level="project" />
24-
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
22+
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.17" level="project" />
23+
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.10.0" 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" />
2726
<orderEntry type="library" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
2827
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />
2928
<orderEntry type="library" scope="PROVIDED" name="Maven: org.immutables:value:2.6.1" level="project" />
3029
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
30+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
3131
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.17.RELEASE" level="project" />
3232
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.5.13.RELEASE" level="project" />
3333
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.11" level="project" />

‎integration-test/integration-test.iml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222
<orderEntry type="library" scope="TEST" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
2323
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
2424
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
25-
<orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-compress:1.16.1" level="project" />
26-
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
27-
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
25+
<orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-compress:1.17" level="project" />
26+
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.10.0" level="project" />
2827
<orderEntry type="module" module-name="cloudfoundry-client-reactor" scope="TEST" />
2928
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.11.1" level="project" />
3029
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
@@ -76,6 +75,7 @@
7675
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
7776
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
7877
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
78+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
7979
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
8080
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
8181
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />

‎pom.xml‎

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

4646
<properties>
47-
<assertj.version>3.9.1</assertj.version>
48-
<commons-compress.version>1.16.1</commons-compress.version>
47+
<assertj.version>3.10.0</assertj.version>
48+
<commons-compress.version>1.17</commons-compress.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>

0 commit comments

Comments
 (0)