From 6bd58fd5e7755128ed0e36deb59fe2b28b28ceb5 Mon Sep 17 00:00:00 2001
From: Clement Escoffier <clement.escoffier@gmail.com>
Date: Thu, 3 Jan 2019 09:26:30 +0100
Subject: [PATCH 1/5] Bump rxjava 2 version to 2.2.5

---
 build-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 3770f06b71829..f4d2753df98d3 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -79,7 +79,7 @@
       <agroal.version>1.2</agroal.version>
       <jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
       <javax.persistence-api.version>2.2</javax.persistence-api.version>
-      <rxjava.version>2.2.4</rxjava.version>
+      <rxjava.version>2.2.5</rxjava.version>
       <microprofile-rest-client-api.version>1.0</microprofile-rest-client-api.version>
       <microprofile-opentracing-api.version>1.2</microprofile-opentracing-api.version>
       <microprofile-reactive-streams-operators.version>1.0-RC3</microprofile-reactive-streams-operators.version>

From fb469cc3c99770498bda21ad8fa927d276494113 Mon Sep 17 00:00:00 2001
From: Clement Escoffier <clement.escoffier@gmail.com>
Date: Thu, 3 Jan 2019 09:27:21 +0100
Subject: [PATCH 2/5] Remove the usage of a custom maven repository

RCs of the MP reactive streams operators spec are now on Maven Central
---
 .../reactive-streams-operators/deployment/pom.xml     | 11 -----------
 .../reactive-streams-operators/runtime/pom.xml        | 11 -----------
 2 files changed, 22 deletions(-)

diff --git a/extensions/reactive-streams-operators/reactive-streams-operators/deployment/pom.xml b/extensions/reactive-streams-operators/reactive-streams-operators/deployment/pom.xml
index 50d42cb589a2e..daf953260044e 100644
--- a/extensions/reactive-streams-operators/reactive-streams-operators/deployment/pom.xml
+++ b/extensions/reactive-streams-operators/reactive-streams-operators/deployment/pom.xml
@@ -39,15 +39,4 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>bintray-jroper-maven</id>
-            <name>bintray</name>
-            <url>https://dl.bintray.com/jroper/maven</url>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/extensions/reactive-streams-operators/reactive-streams-operators/runtime/pom.xml b/extensions/reactive-streams-operators/reactive-streams-operators/runtime/pom.xml
index 6a03e13e3e260..a893cf0b72b2b 100644
--- a/extensions/reactive-streams-operators/reactive-streams-operators/runtime/pom.xml
+++ b/extensions/reactive-streams-operators/reactive-streams-operators/runtime/pom.xml
@@ -65,15 +65,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>bintray-jroper-maven</id>
-            <name>bintray</name>
-            <url>https://dl.bintray.com/jroper/maven</url>
-        </repository>
-    </repositories>
-
 </project>

From a0d68f431319502909fc7cdfe4a16a5fdd67e87f Mon Sep 17 00:00:00 2001
From: Clement Escoffier <clement.escoffier@gmail.com>
Date: Thu, 3 Jan 2019 09:29:12 +0100
Subject: [PATCH 3/5] Update MicroProfile Reactive Streams Operators related
 dependencies

Spec: 1.0-RC4
Implementation: 0.4.0
---
 build-parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index f4d2753df98d3..2cada40efb59d 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -42,7 +42,7 @@
       <smallrye-open-api.version>1.0.2</smallrye-open-api.version>
       <smallrye-opentracing.version>1.2.0</smallrye-opentracing.version>
       <smallrye-fault-tolerance.version>1.0.2</smallrye-fault-tolerance.version>
-      <smallrye-reactive-streams-operators.version>0.3.1</smallrye-reactive-streams-operators.version>
+      <smallrye-reactive-streams-operators.version>0.4.0</smallrye-reactive-streams-operators.version>
       <javax.activation.version>1.1.1</javax.activation.version>
       <javax.inject.version>1</javax.inject.version>
       <javax.annotation-api.version>1.3</javax.annotation-api.version>
@@ -82,7 +82,7 @@
       <rxjava.version>2.2.5</rxjava.version>
       <microprofile-rest-client-api.version>1.0</microprofile-rest-client-api.version>
       <microprofile-opentracing-api.version>1.2</microprofile-opentracing-api.version>
-      <microprofile-reactive-streams-operators.version>1.0-RC3</microprofile-reactive-streams-operators.version>
+      <microprofile-reactive-streams-operators.version>1.0-RC4</microprofile-reactive-streams-operators.version>
       <wildfly.openssl.version>1.0.6.Final</wildfly.openssl.version>
       <jboss-logging-annotations.version>2.1.0.Final</jboss-logging-annotations.version>
       <log4j.version>1.2.16</log4j.version>

From 998a60feb2e2fde7c36c8eea8496c3e6e038df25 Mon Sep 17 00:00:00 2001
From: Clement Escoffier <clement.escoffier@gmail.com>
Date: Thu, 3 Jan 2019 09:45:17 +0100
Subject: [PATCH 4/5] Update artifacts GAV

The spec artifacts have changed between the RC3 and RC4 to be inlined with the other MicroProfile specs.
---
 .../reactive-streams-operators/runtime/pom.xml              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/reactive-streams-operators/reactive-streams-operators/runtime/pom.xml b/extensions/reactive-streams-operators/reactive-streams-operators/runtime/pom.xml
index a893cf0b72b2b..3ad1d5c2fd148 100644
--- a/extensions/reactive-streams-operators/reactive-streams-operators/runtime/pom.xml
+++ b/extensions/reactive-streams-operators/reactive-streams-operators/runtime/pom.xml
@@ -30,12 +30,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.eclipse.microprofile.reactive.streams</groupId>
-            <artifactId>microprofile-reactive-streams-operators</artifactId>
+            <groupId>org.eclipse.microprofile.reactive-streams-operators</groupId>
+            <artifactId>microprofile-reactive-streams-operators-api</artifactId>
             <version>${microprofile-reactive-streams-operators.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.microprofile.reactive.streams</groupId>
+            <groupId>org.eclipse.microprofile.reactive-streams-operators</groupId>
             <artifactId>microprofile-reactive-streams-operators-core</artifactId>
             <version>${microprofile-reactive-streams-operators.version}</version>
         </dependency>

From 422107b6e9df72b07a1744d2974bd724ca62a16c Mon Sep 17 00:00:00 2001
From: Clement Escoffier <clement.escoffier@gmail.com>
Date: Thu, 3 Jan 2019 09:46:22 +0100
Subject: [PATCH 5/5] Update package names

The package names from the spec have been refactored between the RC3 and RC4 to be inlined with the other MicroProfile specs.
---
 .../shamrock/rsops/ReactiveStreamsOperatorsProcessor.java   | 6 +++---
 .../example/reactive/ReactiveStreamOpsResource.java         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/reactive-streams-operators/reactive-streams-operators/deployment/src/main/java/org/jboss/shamrock/rsops/ReactiveStreamsOperatorsProcessor.java b/extensions/reactive-streams-operators/reactive-streams-operators/deployment/src/main/java/org/jboss/shamrock/rsops/ReactiveStreamsOperatorsProcessor.java
index ce3c67f19ff21..2e1f3c1869b59 100644
--- a/extensions/reactive-streams-operators/reactive-streams-operators/deployment/src/main/java/org/jboss/shamrock/rsops/ReactiveStreamsOperatorsProcessor.java
+++ b/extensions/reactive-streams-operators/reactive-streams-operators/deployment/src/main/java/org/jboss/shamrock/rsops/ReactiveStreamsOperatorsProcessor.java
@@ -17,9 +17,9 @@
 package org.jboss.shamrock.rsops;
 
 import io.smallrye.reactive.streams.Engine;
-import org.eclipse.microprofile.reactive.streams.ReactiveStreamsFactory;
-import org.eclipse.microprofile.reactive.streams.core.ReactiveStreamsFactoryImpl;
-import org.eclipse.microprofile.reactive.streams.spi.ReactiveStreamsEngine;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreamsFactory;
+import org.eclipse.microprofile.reactive.streams.operators.core.ReactiveStreamsFactoryImpl;
+import org.eclipse.microprofile.reactive.streams.operators.spi.ReactiveStreamsEngine;
 import org.jboss.shamrock.annotations.BuildProducer;
 import org.jboss.shamrock.annotations.BuildStep;
 import org.jboss.shamrock.deployment.builditem.substrate.ServiceProviderBuildItem;
diff --git a/integration-tests/main/src/main/java/org/jboss/shamrock/example/reactive/ReactiveStreamOpsResource.java b/integration-tests/main/src/main/java/org/jboss/shamrock/example/reactive/ReactiveStreamOpsResource.java
index 7d11971bee9f9..9e933016232be 100644
--- a/integration-tests/main/src/main/java/org/jboss/shamrock/example/reactive/ReactiveStreamOpsResource.java
+++ b/integration-tests/main/src/main/java/org/jboss/shamrock/example/reactive/ReactiveStreamOpsResource.java
@@ -17,7 +17,7 @@
 package org.jboss.shamrock.example.reactive;
 
 import io.reactivex.Flowable;
-import org.eclipse.microprofile.reactive.streams.ReactiveStreams;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;