Skip to content

Commit 3209791

Browse files
nebhalenebhale
committed
Reactor Updates
This change updates reactor-core and reactor-netty to 3.0.4.RELEASE, as well as updating the code for the latest snapshot of reactor-netty.
1 parent 1f9e584 commit 3209791

File tree

10 files changed

+24
-24
lines changed

10 files changed

+24
-24
lines changed

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ Most projects will need two dependencies; the Operations API and an implementati
1313
<dependency>
1414
<groupId>org.cloudfoundry</groupId>
1515
<artifactId>cloudfoundry-client-reactor</artifactId>
16-
<version>2.0.1.RELEASE</version>
16+
<version>2.1.0.RELEASE</version>
1717
</dependency>
1818
<dependency>
1919
<groupId>org.cloudfoundry</groupId>
2020
<artifactId>cloudfoundry-operations</artifactId>
21-
<version>2.0.1.RELEASE</version>
21+
<version>2.1.0.RELEASE</version>
2222
</dependency>
2323
<dependency>
2424
<groupId>io.projectreactor</groupId>
2525
<artifactId>reactor-core</artifactId>
26-
<version>3.0.3.RELEASE</version>
26+
<version>3.0.4.RELEASE</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>io.projectreactor.ipc</groupId>
3030
<artifactId>reactor-netty</artifactId>
31-
<version>0.5.1.RELEASE</version>
31+
<version>0.6.0.RELEASE</version>
3232
</dependency>
3333
...
3434
</dependencies>
@@ -76,10 +76,10 @@ For Gradle, the dependencies would be defined like this:
7676

7777
```groovy
7878
dependencies {
79-
compile 'org.cloudfoundry:cloudfoundry-client-reactor:2.0.1.RELEASE'
80-
compile 'org.cloudfoundry:cloudfoundry-operations:2.0.1.RELEASE'
81-
compile 'io.projectreactor:reactor-core:3.0.3.RELEASE'
82-
compile 'io.projectreactor.ipc:reactor-netty:0.5.1.RELEASE'
79+
compile 'org.cloudfoundry:cloudfoundry-client-reactor:2.1.0.RELEASE'
80+
compile 'org.cloudfoundry:cloudfoundry-operations:2.1.0.RELEASE'
81+
compile 'io.projectreactor:reactor-core:3.0.4.RELEASE'
82+
compile 'io.projectreactor.ipc:reactor-netty:0.6.0.RELEASE'
8383
...
8484
}
8585
```

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.11.0" level="project" />
3232
<orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk15on:1.50" level="project" />
3333
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
34-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.addons:reactor-test:3.0.3.RELEASE" level="project" />
35-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.3.RELEASE" level="project" />
34+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.addons:reactor-test:3.0.4.RELEASE" level="project" />
35+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.4.RELEASE" level="project" />
3636
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
3737
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.6.0.BUILD-SNAPSHOT" level="project" />
3838
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc:0.6.0.BUILD-SNAPSHOT" level="project" />

‎cloudfoundry-client/cloudfoundry-client.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />
2727
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
2828
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
29-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.3.RELEASE" level="project" />
29+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.4.RELEASE" level="project" />
3030
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
3131
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.6.1" level="project" />
3232
<orderEntry type="library" scope="PROVIDED" name="Maven: org.immutables:value:2.3.10" level="project" />

‎cloudfoundry-gradle-plugin/cloudfoundry-gradle-plugin.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
1818
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.6.0.BUILD-SNAPSHOT" level="project" />
1919
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc:0.6.0.BUILD-SNAPSHOT" level="project" />
20-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.3.RELEASE" level="project" />
20+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.4.RELEASE" level="project" />
2121
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
2222
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
2323
<orderEntry type="module" module-name="cloudfoundry-client" />

‎cloudfoundry-maven-plugin/cloudfoundry-maven-plugin.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.7.0" level="project" />
1818
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.6.0.BUILD-SNAPSHOT" level="project" />
1919
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc:0.6.0.BUILD-SNAPSHOT" level="project" />
20-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.3.RELEASE" level="project" />
20+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.4.RELEASE" level="project" />
2121
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
2222
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.6.Final" level="project" />
2323
<orderEntry type="module" module-name="cloudfoundry-client" />

‎cloudfoundry-operations/cloudfoundry-operations.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.5" level="project" />
2323
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5" level="project" />
2424
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5" level="project" />
25-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.addons:reactor-test:3.0.3.RELEASE" level="project" />
26-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.3.RELEASE" level="project" />
25+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.addons:reactor-test:3.0.4.RELEASE" level="project" />
26+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.4.RELEASE" level="project" />
2727
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
2828
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
2929
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />

‎cloudfoundry-util/cloudfoundry-util.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5" level="project" />
1515
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.5" level="project" />
1616
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5" level="project" />
17-
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.3.RELEASE" level="project" />
17+
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.4.RELEASE" level="project" />
1818
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
19-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.addons:reactor-test:3.0.3.RELEASE" level="project" />
19+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.addons:reactor-test:3.0.4.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" />
2222
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.12" level="project" />

‎cloudfoundry-util/src/main/java/org/cloudfoundry/util/SortingUtils.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.cloudfoundry.util;
1818

19-
import reactor.core.Cancellation;
19+
import reactor.core.Disposable;
2020
import reactor.core.publisher.DirectProcessor;
2121
import reactor.core.publisher.Flux;
2222
import reactor.util.function.Tuple2;
@@ -56,7 +56,7 @@ public static <T> Function<Flux<T>, Flux<T>> timespan(Comparator<T> comparator,
5656

5757
DirectProcessor<Void> d = DirectProcessor.create();
5858

59-
Cancellation cancellation = source
59+
Disposable disposable = source
6060
.timestamp()
6161
.subscribe(item -> {
6262
Optional.ofNullable(item)
@@ -71,7 +71,7 @@ public static <T> Function<Flux<T>, Flux<T>> timespan(Comparator<T> comparator,
7171
.interval(timespan)
7272
.takeUntilOther(d)
7373
.flatMap(n -> getItems(accumulator, comparator, timespan), null, () -> getItems(accumulator, comparator, Duration.ZERO))
74-
.doOnCancel(cancellation::dispose);
74+
.doOnCancel(disposable::dispose);
7575
};
7676
}
7777

‎integration-test/integration-test.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
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.addons:reactor-test:3.0.3.RELEASE" level="project" />
20-
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-core:3.0.3.RELEASE" level="project" />
19+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.addons:reactor-test:3.0.4.RELEASE" level="project" />
20+
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-core:3.0.4.RELEASE" level="project" />
2121
<orderEntry type="library" scope="TEST" name="Maven: org.reactivestreams:reactive-streams:1.0.0" 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" />

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
<netty.version>4.1.6.Final</netty.version>
5757
<okhttp.version>3.5.0</okhttp.version>
5858
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
59-
<reactor-addons.version>3.0.3.RELEASE</reactor-addons.version>
60-
<reactor-core.version>3.0.3.RELEASE</reactor-core.version>
59+
<reactor-addons.version>3.0.4.RELEASE</reactor-addons.version>
60+
<reactor-core.version>3.0.4.RELEASE</reactor-core.version>
6161
<reactor-netty.version>0.6.0.BUILD-SNAPSHOT</reactor-netty.version>
6262
<wire.version>2.2.0</wire.version>
6363
</properties>

0 commit comments

Comments
 (0)