Skip to content

Commit

Permalink
Reactor Updates
Browse files Browse the repository at this point in the history
This change updates the project to use reactor-core 3.0.0.RC2 and reactor-
netty 0.5.0.M3.
  • Loading branch information
nebhale committed Aug 12, 2016
1 parent bf4f120 commit 0adebaf
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 21 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ Most projects will need two dependencies; the Operations API and an implementati
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.0.0.BUILD-SNAPSHOT</version>
<version>3.0.0.RC2</version>
</dependency>
<dependency>
<groupId>io.projectreactor.ipc</groupId>
<artifactId>reactor-netty</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version>
<version>0.5.0.M3</version>
</dependency>
...
</dependencies>
Expand Down Expand Up @@ -78,8 +78,8 @@ For Gradle, the dependencies would be defined like this:
dependencies {
compile 'org.cloudfoundry:cloudfoundry-client-reactor:2.0.0.BUILD-SNAPSHOT'
compile 'org.cloudfoundry:cloudfoundry-operations:2.0.0.BUILD-SNAPSHOT'
compile 'io.projectreactor:reactor-core:3.0.0.BUILD-SNAPSHOT'
compile 'io.projectreactor.ipc:reactor-netty:0.5.0.BUILD-SNAPSHOT'
compile 'io.projectreactor:reactor-core:3.0.0.RC2'
compile 'io.projectreactor.ipc:reactor-netty:0.5.0.M3'
...
}
```
Expand Down
6 changes: 3 additions & 3 deletions cloudfoundry-client-reactor/cloudfoundry-client-reactor.iml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.9.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:okhttp-ws:3.4.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk15on:1.50" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.5.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc-api:0.5.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.5.0.M3" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc-api:0.5.0.M3" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.4.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="module" module-name="cloudfoundry-client" />
<orderEntry type="library" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.RC2" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
<orderEntry type="module" module-name="cloudfoundry-util" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.12" level="project" />
Expand Down
2 changes: 1 addition & 1 deletion cloudfoundry-client/cloudfoundry-client.iml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.RC2" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.immutables:value:2.2.10" level="project" />
</component>
Expand Down
6 changes: 3 additions & 3 deletions cloudfoundry-gradle-plugin/cloudfoundry-gradle-plugin.iml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.1" level="project" />
<orderEntry type="library" name="Maven: com.github.zafarkhaja:java-semver:0.9.0" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.5.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc-api:0.5.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.5.0.M3" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc-api:0.5.0.M3" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.4.Final" level="project" />
<orderEntry type="module" module-name="cloudfoundry-client" />
<orderEntry type="library" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.RC2" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
<orderEntry type="module" module-name="cloudfoundry-util" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.12" level="project" />
Expand Down
6 changes: 3 additions & 3 deletions cloudfoundry-maven-plugin/cloudfoundry-maven-plugin.iml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.1" level="project" />
<orderEntry type="library" name="Maven: com.github.zafarkhaja:java-semver:0.9.0" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.5.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc-api:0.5.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.5.0.M3" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc-api:0.5.0.M3" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.4.Final" level="project" />
<orderEntry type="module" module-name="cloudfoundry-client" />
<orderEntry type="library" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.RC2" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
<orderEntry type="module" module-name="cloudfoundry-util" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.12" level="project" />
Expand Down
2 changes: 1 addition & 1 deletion cloudfoundry-operations/cloudfoundry-operations.iml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<orderEntry type="module" module-name="cloudfoundry-client" />
<orderEntry type="library" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.RC2" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
<orderEntry type="module" module-name="cloudfoundry-util" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.12" level="project" />
Expand Down
2 changes: 1 addition & 1 deletion cloudfoundry-util/cloudfoundry-util.iml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.1" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.1" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.0.RC2" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
Expand Down
6 changes: 3 additions & 3 deletions integration-test/integration-test.iml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-netty:0.5.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-ipc-api:0.5.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-netty:0.5.0.M3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-ipc-api:0.5.0.M3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-all:4.1.4.Final" level="project" />
<orderEntry type="module" module-name="cloudfoundry-client" scope="TEST" />
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okio:okio:1.8.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-core:3.0.0.BUILD-SNAPSHOT" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-core:3.0.0.RC2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.reactivestreams:reactive-streams:1.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
Expand Down
12 changes: 10 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
<netty.version>4.1.4.Final</netty.version>
<okhttp.version>3.4.1</okhttp.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<reactor-core.version>3.0.0.BUILD-SNAPSHOT</reactor-core.version>
<reactor-netty.version>0.5.0.BUILD-SNAPSHOT</reactor-netty.version>
<reactor-core.version>3.0.0.RC2</reactor-core.version>
<reactor-netty.version>0.5.0.M3</reactor-netty.version>
<wire.version>2.2.0</wire.version>
</properties>

Expand Down Expand Up @@ -225,6 +225,14 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>http://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
Expand Down

0 comments on commit 0adebaf

Please sign in to comment.