Update reactor converter package

spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java

@@ -44,10 +44,10 @@ public class ReactiveStreamsToCompletableFutureConverter implements GenericConve
 			return null;
 		}
 		else if (CompletableFuture.class.isAssignableFrom(source.getClass())) {
-			return reactor.core.publisher.convert.CompletableFutureConverter.from((CompletableFuture) source);
+			return reactor.core.converter.CompletableFutureConverter.from((CompletableFuture) source);
 		}
 		else if (CompletableFuture.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) {
-			return reactor.core.publisher.convert.CompletableFutureConverter.fromSingle((Publisher) source);
+			return reactor.core.converter.CompletableFutureConverter.fromSingle((Publisher) source);
 		}
 		return null;
 	}

spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToRxJava1Converter.java

@@ -20,7 +20,7 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.reactivestreams.Publisher;
-import reactor.core.publisher.convert.RxJava1Converter;
+import reactor.core.converter.RxJava1Converter;
 import rx.Observable;
 import rx.Single;
 
@@ -56,10 +56,10 @@ public final class ReactiveStreamsToRxJava1Converter implements GenericConverter
 			return RxJava1Converter.from((Publisher) source);
 		}
 		else if (Single.class.isAssignableFrom(source.getClass())) {
-			return reactor.core.publisher.convert.RxJava1SingleConverter.from((Single) source);
+			return reactor.core.converter.RxJava1SingleConverter.from((Single) source);
 		}
 		else if (Single.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) {
-			return reactor.core.publisher.convert.RxJava1SingleConverter.from((Publisher) source);
+			return reactor.core.converter.RxJava1SingleConverter.from((Publisher) source);
 		}
 		return null;
 	}

spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyHttpHandlerAdapter.java

@@ -21,7 +21,7 @@ import io.reactivex.netty.protocol.http.server.HttpServerRequest;
 import io.reactivex.netty.protocol.http.server.HttpServerResponse;
 import io.reactivex.netty.protocol.http.server.RequestHandler;
 import org.reactivestreams.Publisher;
-import reactor.core.publisher.convert.RxJava1Converter;
+import reactor.core.converter.RxJava1Converter;
 import rx.Observable;
 
 import org.springframework.util.Assert;

spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java

@@ -26,8 +26,8 @@ import java.util.Map;
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.http.cookie.Cookie;
 import io.reactivex.netty.protocol.http.server.HttpServerRequest;
+import reactor.core.converter.RxJava1Converter;
 import reactor.core.publisher.Flux;
-import reactor.core.publisher.convert.RxJava1Converter;
 import rx.Observable;
 
 import org.springframework.http.HttpCookie;

spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java

@@ -24,7 +24,7 @@ import io.netty.handler.codec.http.cookie.DefaultCookie;
 import io.reactivex.netty.protocol.http.server.HttpServerResponse;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Mono;
-import reactor.core.publisher.convert.RxJava1Converter;
+import reactor.core.converter.RxJava1Converter;
 import rx.Observable;
 
 import org.springframework.http.HttpCookie;

spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/StringDecoderTests.java

@@ -23,7 +23,7 @@ import java.util.stream.StreamSupport;
 import org.junit.Test;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.core.publisher.convert.RxJava1SingleConverter;
+import reactor.core.converter.RxJava1SingleConverter;
 import reactor.io.buffer.Buffer;
 import rx.Single;