From edb0fcefafd8e094ae89147228c29da3900ca94a Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Mon, 7 Sep 2015 15:53:36 +0200 Subject: [PATCH 1/3] Update RxNetty artifactId to use their latest Snapshot --- spring-web-reactive/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-web-reactive/build.gradle b/spring-web-reactive/build.gradle index 07501e6280..03917f319a 100644 --- a/spring-web-reactive/build.gradle +++ b/spring-web-reactive/build.gradle @@ -25,7 +25,7 @@ dependencies { compile "io.projectreactor:reactor-stream:2.0.5.RELEASE" compile "commons-logging:commons-logging:1.2" - optional "io.reactivex:rxnetty:0.5.0-SNAPSHOT" + optional "io.reactivex:rxnetty-http:0.5.0-SNAPSHOT" optional "io.reactivex:rxjava-reactive-streams:1.0.1" provided "javax.servlet:javax.servlet-api:3.1.0" From 357ce225f33f55f99f14a32df7a61341451b0c06 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Mon, 7 Sep 2015 15:54:33 +0200 Subject: [PATCH 2/3] Polishing --- .../io/ByteArrayPublisherInputStream.java | 4 +++- .../io/ByteArrayPublisherOutputStream.java | 16 ++++++++++++++++ ...a => ByteArrayPublisherInputStreamTests.java} | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) rename spring-web-reactive/src/test/java/org/springframework/reactive/io/{ByteBufPublisherInputStreamTests.java => ByteArrayPublisherInputStreamTests.java} (97%) diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherInputStream.java b/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherInputStream.java index 03b81aafa3..4411d953d2 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherInputStream.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherInputStream.java @@ -1,4 +1,4 @@ -package org.springframework.reactive.io;/* +/* * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -14,6 +14,8 @@ package org.springframework.reactive.io;/* * limitations under the License. */ +package org.springframework.reactive.io; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherOutputStream.java b/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherOutputStream.java index 7cd84c6085..9ba1a3de85 100644 --- a/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherOutputStream.java +++ b/spring-web-reactive/src/main/java/org/springframework/reactive/io/ByteArrayPublisherOutputStream.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.reactive.io; import java.io.IOException; diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/io/ByteBufPublisherInputStreamTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/io/ByteArrayPublisherInputStreamTests.java similarity index 97% rename from spring-web-reactive/src/test/java/org/springframework/reactive/io/ByteBufPublisherInputStreamTests.java rename to spring-web-reactive/src/test/java/org/springframework/reactive/io/ByteArrayPublisherInputStreamTests.java index 45ae841646..ae872593a1 100644 --- a/spring-web-reactive/src/test/java/org/springframework/reactive/io/ByteBufPublisherInputStreamTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/reactive/io/ByteArrayPublisherInputStreamTests.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; /** * @author Arjen Poutsma */ -public class ByteBufPublisherInputStreamTests { +public class ByteArrayPublisherInputStreamTests { private BlockingSignalQueue queue; From e47069775ca0fef2ab147141f8018e0f203ba478 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Tue, 8 Sep 2015 14:23:35 +0200 Subject: [PATCH 3/3] Update dependencies (Spring 4.2.1, Tomcat 8.0.26, Jetty 9.3.3) This commit also polishes build.gradle to use double quotes consistently. --- spring-web-reactive/build.gradle | 37 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/spring-web-reactive/build.gradle b/spring-web-reactive/build.gradle index 03917f319a..d6e0eaee6a 100644 --- a/spring-web-reactive/build.gradle +++ b/spring-web-reactive/build.gradle @@ -1,29 +1,30 @@ buildscript { repositories { - maven { url 'https://repo.spring.io/plugins-release' } + maven { url "https://repo.spring.io/plugins-release" } } dependencies { - classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7' + classpath "org.springframework.build.gradle:propdeps-plugin:0.0.7" } } -apply plugin: 'java' -apply plugin: 'propdeps' -apply plugin: 'propdeps-idea' -apply plugin: 'propdeps-maven' +apply plugin: "java" +apply plugin: "propdeps" +apply plugin: "propdeps-idea" +apply plugin: "propdeps-maven" repositories { mavenCentral() - maven { url 'https://oss.jfrog.org/libs-snapshot' } // RxNetty 0.5.x snapshots + maven { url "https://oss.jfrog.org/libs-snapshot" } // RxNetty 0.5.x snapshots } dependencies { - compile "org.springframework:spring-core:4.2.0.RELEASE" - compile "org.springframework:spring-web:4.2.0.RELEASE" + compile "org.springframework:spring-core:4.2.1.RELEASE" + compile "org.springframework:spring-web:4.2.1.RELEASE" compile "org.reactivestreams:reactive-streams:1.0.0" compile "io.projectreactor:reactor-stream:2.0.5.RELEASE" compile "commons-logging:commons-logging:1.2" + compile "com.fasterxml.jackson.core:jackson-databind:2.6.1" optional "io.reactivex:rxnetty-http:0.5.0-SNAPSHOT" optional "io.reactivex:rxjava-reactive-streams:1.0.1" @@ -31,22 +32,20 @@ dependencies { provided "javax.servlet:javax.servlet-api:3.1.0" testCompile "junit:junit:4.12" - testCompile "org.springframework:spring-test:4.2.0.RELEASE" + testCompile "org.springframework:spring-test:4.2.1.RELEASE" - testCompile 'org.apache.tomcat:tomcat-util:8.0.24' - testCompile 'org.apache.tomcat.embed:tomcat-embed-core:8.0.24' + testCompile "org.apache.tomcat:tomcat-util:8.0.26" + testCompile "org.apache.tomcat.embed:tomcat-embed-core:8.0.26" - testCompile 'org.eclipse.jetty:jetty-server:9.3.2.v20150730' - testCompile 'org.eclipse.jetty:jetty-servlet:9.3.2.v20150730' + testCompile "org.eclipse.jetty:jetty-server:9.3.3.v20150827" + testCompile "org.eclipse.jetty:jetty-servlet:9.3.3.v20150827" testCompile "org.slf4j:slf4j-jcl:1.7.12" testCompile "org.slf4j:jul-to-slf4j:1.7.12" - testCompile("log4j:log4j:1.2.16") + testCompile "log4j:log4j:1.2.16" testCompile("org.mockito:mockito-core:1.10.19") { - exclude group: 'org.hamcrest', module: 'hamcrest-core' + exclude group: "org.hamcrest", module: "hamcrest-core" } - testCompile("org.hamcrest:hamcrest-all:1.3") + testCompile "org.hamcrest:hamcrest-all:1.3" } - -