Merge branch 'eugenp:master' into master

gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/gradle-wrapper/gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradle/gradle-wrapper/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'gradle-wrapper'

pom.xml

@@ -521,11 +521,7 @@
                 <module>restx</module>
                 <module>rsocket</module>
                 <module>rule-engines</module>
-                <module>rxjava-core</module>
-                <module>rxjava-libraries</module>
-                <module>rxjava-observables</module>
-                <module>rxjava-operators</module>
-
+                <module>rxjava-modules</module>
                 <module>atomikos</module>
                 <module>reactive-systems</module>
                 <module>slack</module>
@@ -976,11 +972,7 @@
                 <module>restx</module>
                 <module>rsocket</module>
                 <module>rule-engines</module>
-                <module>rxjava-core</module>
-                <module>rxjava-libraries</module>
-                <module>rxjava-observables</module>
-                <module>rxjava-operators</module>
-
+                <module>rxjava-modules</module>
                 <module>atomikos</module>
                 <module>reactive-systems</module>
                 <module>slack</module>
@@ -1057,9 +1049,7 @@
                 <module>spring-caching-2</module>
 
                 <module>spring-cloud-modules</module>
-                <module>spring-cloud-bus</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                <module>spring-cloud-data-flow</module>
 
                 <module>spring-core</module>
                 <module>spring-core-2</module>
@@ -1101,7 +1091,6 @@
                 <module>spring-scheduling</module>
                 <module>spring-security-modules</module>
                 <module>spring-shell</module>
-                <module>spring-sleuth</module>
                 <module>spring-soap</module>
                 <module>spring-spel</module>
                 <module>spring-state-machine</module>

rxjava-core/pom.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>rxjava-core</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>rxjava-core</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-java</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-java</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.reactivex</groupId>
-            <artifactId>rxjava</artifactId>
-            <version>${rx.java.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.reactivex.rxjava2</groupId>
-            <artifactId>rxjava</artifactId>
-            <version>${rx.java2.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${awaitility.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <rx.java.version>1.2.5</rx.java.version>
-        <awaitility.version>1.7.0</awaitility.version>
-        <rx.java2.version>2.2.2</rx.java2.version>
-    </properties>
-
-</project>

rxjava-modules/pom.xml

@@ -3,9 +3,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>rxjava-operators</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>rxjava-operators</name>
+    <groupId>com.baeldung.rxjava-modules</groupId>
+    <artifactId>rxjava-modules</artifactId>
+    <name>rxjava-modules</name>
+    <packaging>pom</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -14,6 +15,13 @@
         <relativePath>../parent-java</relativePath>
     </parent>
 
+    <modules>
+        <module>rxjava-core</module>
+        <module>rxjava-libraries</module>
+        <module>rxjava-observables</module>
+        <module>rxjava-operators</module>
+    </modules>
+
     <dependencies>
         <dependency>
             <groupId>io.reactivex</groupId>
@@ -25,11 +33,10 @@
             <artifactId>rxjava</artifactId>
             <version>${rx.java2.version}</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.github.akarnokd/rxjava2-extensions -->
         <dependency>
-            <groupId>com.github.akarnokd</groupId>
-            <artifactId>rxjava2-extensions</artifactId>
-            <version>${rxjava2.ext.version}</version>
+            <groupId>io.reactivex</groupId>
+            <artifactId>rxjava-string</artifactId>
+            <version>${rx.java.string.version}</version>
         </dependency>
         <dependency>
             <groupId>io.reactivex</groupId>
@@ -44,11 +51,11 @@
     </dependencies>
 
     <properties>
-        <rxjava2.ext.version>0.20.4</rxjava2.ext.version>
-        <rx.java2.version>2.2.2</rx.java2.version>
         <rx.java.version>1.2.5</rx.java.version>
-        <rx.java.math.version>1.0.0</rx.java.math.version>
         <awaitility.version>1.7.0</awaitility.version>
+        <rx.java.string.version>1.1.1</rx.java.string.version>
+        <rx.java.math.version>1.0.0</rx.java.math.version>
+        <rx.java2.version>2.2.2</rx.java2.version>
     </properties>
 
 </project>

rxjava-modules/rxjava-core/README.md

@@ -13,4 +13,3 @@ This module contains articles about RxJava.
 - [RxJava Maybe](https://www.baeldung.com/rxjava-maybe)
 - [Combining RxJava Completables](https://www.baeldung.com/rxjava-completable)
 - [RxJava Hooks](https://www.baeldung.com/rxjava-hooks)
-- More articles: [[next -->]](/rxjava-2)

rxjava-modules/rxjava-core/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>rxjava-core</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>rxjava-core</name>
+    <parent>
+        <groupId>com.baeldung.rxjava-modules</groupId>
+        <artifactId>rxjava-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+</project>