[JAVA-16376] Moved quarkus-modules to jdk9-and-above profile (#13487)
* [JAVA-16376] Moved quarkus-modules to jdk9-and-above profile * [JAVA-18171] Moved reactive-systems module to jdk9-and-above profile * [JAVA-18170] Moved rxjava-modules to jdk9-and-above profile * [JAVA-18165] Moved patterns-modules to jdk9-and-above profile * [JAVA-18168] Upgraded quarkus version * [JAVA-16394] Moved groovy modules to jdk9-and-above profile * [JAVA-18165] Reverted changes for pattern-modules * [JAVA-16394] Upgraded dependencies to latest versions * [JAVA-18134] Upgraded guava-modules to java 11 and moved to jdk9-and-above profile * [JAVA-16394] Fixed groovy-eclipse-batch dependency version --------- Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
This commit is contained in:
parent
58b8b7ecc7
commit
12f814488b
|
@ -83,7 +83,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.groovy</groupId>
|
<groupId>org.codehaus.groovy</groupId>
|
||||||
<artifactId>groovy-eclipse-batch</artifactId>
|
<artifactId>groovy-eclipse-batch</artifactId>
|
||||||
<version>${groovy.version}-01</version>
|
<version>${groovy-eclipse-batch.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
@ -163,9 +163,10 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<groovy-wslite.version>1.1.3</groovy-wslite.version>
|
<groovy-wslite.version>1.1.3</groovy-wslite.version>
|
||||||
<assembly.plugin.version>3.1.0</assembly.plugin.version>
|
<assembly.plugin.version>3.4.2</assembly.plugin.version>
|
||||||
<compiler.plugin.version>3.8.0</compiler.plugin.version>
|
<compiler.plugin.version>3.8.1</compiler.plugin.version>
|
||||||
<groovy.compiler.version>3.3.0-01</groovy.compiler.version>
|
<groovy.compiler.version>3.7.0</groovy.compiler.version>
|
||||||
|
<groovy-eclipse-batch.version>3.0.8-01</groovy-eclipse-batch.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -21,12 +21,12 @@
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<groovy.version>3.0.8</groovy.version>
|
<groovy.version>3.0.15</groovy.version>
|
||||||
<groovy-all.version>3.0.8</groovy-all.version>
|
<groovy-all.version>3.0.15</groovy-all.version>
|
||||||
<groovy-sql.version>3.0.8</groovy-sql.version>
|
<groovy-sql.version>3.0.15</groovy-sql.version>
|
||||||
<hsqldb.version>2.4.0</hsqldb.version>
|
<hsqldb.version>2.7.1</hsqldb.version>
|
||||||
<spock-core.version>2.3-groovy-3.0</spock-core.version>
|
<spock-core.version>2.3-groovy-3.0</spock-core.version>
|
||||||
<gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
|
<gmavenplus-plugin.version>2.1.0</gmavenplus-plugin.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
<version>${java-hamcrest.version}</version>
|
<version>${java-hamcrest.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
31
pom.xml
31
pom.xml
|
@ -336,7 +336,6 @@
|
||||||
<module>checker-plugin</module>
|
<module>checker-plugin</module>
|
||||||
<!-- <module>clojure</module> --> <!-- Not a maven project -->
|
<!-- <module>clojure</module> --> <!-- Not a maven project -->
|
||||||
|
|
||||||
<module>core-groovy-modules</module>
|
|
||||||
<module>core-java-modules</module>
|
<module>core-java-modules</module>
|
||||||
<module>couchbase</module>
|
<module>couchbase</module>
|
||||||
|
|
||||||
|
@ -346,7 +345,6 @@
|
||||||
<module>gradle-modules/gradle/maven-to-gradle</module>
|
<module>gradle-modules/gradle/maven-to-gradle</module>
|
||||||
<!-- <module>grails</module> --> <!-- Not a maven project -->
|
<!-- <module>grails</module> --> <!-- Not a maven project -->
|
||||||
|
|
||||||
<module>guava-modules</module>
|
|
||||||
<!-- <module>guest</module> --> <!-- not to be built as its for guest articles -->
|
<!-- <module>guest</module> --> <!-- not to be built as its for guest articles -->
|
||||||
|
|
||||||
<module>apache-httpclient</module>
|
<module>apache-httpclient</module>
|
||||||
|
@ -402,13 +400,8 @@
|
||||||
<module>performance-tests</module>
|
<module>performance-tests</module>
|
||||||
<module>persistence-modules</module>
|
<module>persistence-modules</module>
|
||||||
|
|
||||||
|
|
||||||
<module>quarkus-modules</module>
|
|
||||||
|
|
||||||
<module>rule-engines-modules</module>
|
<module>rule-engines-modules</module>
|
||||||
<module>rxjava-modules</module>
|
|
||||||
|
|
||||||
<module>reactive-systems</module>
|
|
||||||
<module>security-modules</module>
|
<module>security-modules</module>
|
||||||
|
|
||||||
<module>vavr-modules</module>
|
<module>vavr-modules</module>
|
||||||
|
@ -603,7 +596,6 @@
|
||||||
<module>checker-plugin</module>
|
<module>checker-plugin</module>
|
||||||
<!-- <module>clojure</module> --> <!-- Not a maven project -->
|
<!-- <module>clojure</module> --> <!-- Not a maven project -->
|
||||||
|
|
||||||
<module>core-groovy-modules</module>
|
|
||||||
<module>core-java-modules</module>
|
<module>core-java-modules</module>
|
||||||
<module>couchbase</module>
|
<module>couchbase</module>
|
||||||
<module>drools</module>
|
<module>drools</module>
|
||||||
|
@ -611,8 +603,6 @@
|
||||||
<!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
|
<!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
|
||||||
<module>gradle-modules/gradle/maven-to-gradle</module>
|
<module>gradle-modules/gradle/maven-to-gradle</module>
|
||||||
<!-- <module>grails</module> --> <!-- Not a maven project -->
|
<!-- <module>grails</module> --> <!-- Not a maven project -->
|
||||||
|
|
||||||
<module>guava-modules</module>
|
|
||||||
<!-- <module>guest</module> --> <!-- not to be built as its for guest articles -->
|
<!-- <module>guest</module> --> <!-- not to be built as its for guest articles -->
|
||||||
|
|
||||||
<module>apache-httpclient</module>
|
<module>apache-httpclient</module>
|
||||||
|
@ -657,7 +647,6 @@
|
||||||
<module>microservices-modules</module>
|
<module>microservices-modules</module>
|
||||||
<module>muleesb</module>
|
<module>muleesb</module>
|
||||||
|
|
||||||
|
|
||||||
<module>netflix-modules</module>
|
<module>netflix-modules</module>
|
||||||
|
|
||||||
<module>osgi</module>
|
<module>osgi</module>
|
||||||
|
@ -668,13 +657,8 @@
|
||||||
<module>performance-tests</module>
|
<module>performance-tests</module>
|
||||||
<module>persistence-modules</module>
|
<module>persistence-modules</module>
|
||||||
|
|
||||||
|
|
||||||
<module>quarkus-modules</module>
|
|
||||||
|
|
||||||
<module>rule-engines-modules</module>
|
<module>rule-engines-modules</module>
|
||||||
<module>rxjava-modules</module>
|
|
||||||
|
|
||||||
<module>reactive-systems</module>
|
|
||||||
<module>security-modules</module>
|
<module>security-modules</module>
|
||||||
|
|
||||||
<module>vavr-modules</module>
|
<module>vavr-modules</module>
|
||||||
|
@ -882,6 +866,7 @@
|
||||||
<module>di-modules</module>
|
<module>di-modules</module>
|
||||||
<module>asciidoctor</module>
|
<module>asciidoctor</module>
|
||||||
<module>aws-modules</module>
|
<module>aws-modules</module>
|
||||||
|
<module>core-groovy-modules</module>
|
||||||
<module>core-java-modules/core-java-9</module>
|
<module>core-java-modules/core-java-9</module>
|
||||||
<module>core-java-modules/core-java-9-improvements</module>
|
<module>core-java-modules/core-java-9-improvements</module>
|
||||||
<module>core-java-modules/core-java-9-jigsaw</module>
|
<module>core-java-modules/core-java-9-jigsaw</module>
|
||||||
|
@ -925,6 +910,7 @@
|
||||||
<module>ddd-contexts</module>
|
<module>ddd-contexts</module>
|
||||||
<module>deeplearning4j</module>
|
<module>deeplearning4j</module>
|
||||||
<module>docker-modules</module>
|
<module>docker-modules</module>
|
||||||
|
<module>guava-modules</module>
|
||||||
<module>apache-httpclient-2</module>
|
<module>apache-httpclient-2</module>
|
||||||
<module>kubernetes-modules/kubernetes-spring</module>
|
<module>kubernetes-modules/kubernetes-spring</module>
|
||||||
<module>libraries-concurrency</module>
|
<module>libraries-concurrency</module>
|
||||||
|
@ -934,8 +920,7 @@
|
||||||
<module>optaplanner</module>
|
<module>optaplanner</module>
|
||||||
<module>persistence-modules/sirix</module>
|
<module>persistence-modules/sirix</module>
|
||||||
<module>persistence-modules/spring-data-cassandra-2</module>
|
<module>persistence-modules/spring-data-cassandra-2</module>
|
||||||
<module>quarkus-modules/quarkus-vs-springboot</module>
|
<module>quarkus-modules</module>
|
||||||
<module>quarkus-modules/quarkus-jandex</module>
|
|
||||||
<module>spring-boot-modules/spring-boot-cassandre</module>
|
<module>spring-boot-modules/spring-boot-cassandre</module>
|
||||||
<module>spring-boot-modules/spring-boot-3</module>
|
<module>spring-boot-modules/spring-boot-3</module>
|
||||||
<module>spring-boot-modules/spring-boot-3-native</module>
|
<module>spring-boot-modules/spring-boot-3-native</module>
|
||||||
|
@ -945,6 +930,8 @@
|
||||||
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
|
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
|
||||||
<module>testing-modules/testing-assertions</module>
|
<module>testing-modules/testing-assertions</module>
|
||||||
<module>persistence-modules/fauna</module>
|
<module>persistence-modules/fauna</module>
|
||||||
|
<module>reactive-systems</module>
|
||||||
|
<module>rxjava-modules</module>
|
||||||
<module>lightrun</module>
|
<module>lightrun</module>
|
||||||
<module>tablesaw</module>
|
<module>tablesaw</module>
|
||||||
<module>geotools</module>
|
<module>geotools</module>
|
||||||
|
@ -1092,7 +1079,7 @@
|
||||||
<module>di-modules</module>
|
<module>di-modules</module>
|
||||||
<module>asciidoctor</module>
|
<module>asciidoctor</module>
|
||||||
<module>aws-modules</module>
|
<module>aws-modules</module>
|
||||||
|
<module>core-groovy-modules</module>
|
||||||
<module>core-java-modules/core-java-9</module>
|
<module>core-java-modules/core-java-9</module>
|
||||||
<module>core-java-modules/core-java-9-improvements</module>
|
<module>core-java-modules/core-java-9-improvements</module>
|
||||||
<module>core-java-modules/core-java-9-jigsaw</module>
|
<module>core-java-modules/core-java-9-jigsaw</module>
|
||||||
|
@ -1136,6 +1123,7 @@
|
||||||
<module>ddd-contexts</module>
|
<module>ddd-contexts</module>
|
||||||
<module>deeplearning4j</module>
|
<module>deeplearning4j</module>
|
||||||
<module>docker-modules</module>
|
<module>docker-modules</module>
|
||||||
|
<module>guava-modules</module>
|
||||||
<module>apache-httpclient-2</module>
|
<module>apache-httpclient-2</module>
|
||||||
<module>kubernetes-modules/kubernetes-spring</module>
|
<module>kubernetes-modules/kubernetes-spring</module>
|
||||||
<module>libraries-concurrency</module>
|
<module>libraries-concurrency</module>
|
||||||
|
@ -1145,8 +1133,7 @@
|
||||||
<module>optaplanner</module>
|
<module>optaplanner</module>
|
||||||
<module>persistence-modules/sirix</module>
|
<module>persistence-modules/sirix</module>
|
||||||
<module>persistence-modules/spring-data-cassandra-2</module>
|
<module>persistence-modules/spring-data-cassandra-2</module>
|
||||||
<module>quarkus-modules/quarkus-vs-springboot</module>
|
<module>quarkus-modules</module>
|
||||||
<module>quarkus-modules/quarkus-jandex</module>
|
|
||||||
<module>spring-boot-modules/spring-boot-cassandre</module>
|
<module>spring-boot-modules/spring-boot-cassandre</module>
|
||||||
<module>spring-boot-modules/spring-boot-3</module>
|
<module>spring-boot-modules/spring-boot-3</module>
|
||||||
<module>spring-boot-modules/spring-boot-3-native</module>
|
<module>spring-boot-modules/spring-boot-3-native</module>
|
||||||
|
@ -1156,6 +1143,8 @@
|
||||||
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
|
<module>spring-swagger-codegen/custom-validations-opeanpi-codegen</module>
|
||||||
<module>testing-modules/testing-assertions</module>
|
<module>testing-modules/testing-assertions</module>
|
||||||
<module>persistence-modules/fauna</module>
|
<module>persistence-modules/fauna</module>
|
||||||
|
<module>reactive-systems</module>
|
||||||
|
<module>rxjava-modules</module>
|
||||||
<module>lightrun</module>
|
<module>lightrun</module>
|
||||||
<module>tablesaw</module>
|
<module>tablesaw</module>
|
||||||
<module>geotools</module>
|
<module>geotools</module>
|
||||||
|
|
|
@ -16,7 +16,8 @@
|
||||||
<modules>
|
<modules>
|
||||||
<module>quarkus</module>
|
<module>quarkus</module>
|
||||||
<module>quarkus-extension</module>
|
<module>quarkus-extension</module>
|
||||||
<!--Disabled because requires Java-9 <module>quarkus-jandex</module> <module>quarkus-vs-springboot</module> -->
|
<module>quarkus-jandex</module>
|
||||||
|
<module>quarkus-vs-springboot</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
</project>
|
</project>
|
|
@ -182,7 +182,7 @@
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<quarkus.version>1.7.0.Final</quarkus.version>
|
<quarkus.version>2.16.3.Final</quarkus.version>
|
||||||
<mockito.version>3.3.0</mockito.version>
|
<mockito.version>3.3.0</mockito.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>rxjava-core</module>
|
<module>rxjava-core</module>
|
||||||
|
<module>rxjava-core-2</module>
|
||||||
<module>rxjava-libraries</module>
|
<module>rxjava-libraries</module>
|
||||||
<module>rxjava-observables</module>
|
<module>rxjava-observables</module>
|
||||||
<module>rxjava-operators</module>
|
<module>rxjava-operators</module>
|
||||||
|
|
|
@ -12,7 +12,7 @@ import org.mockito.Mockito;
|
||||||
import rx.Single;
|
import rx.Single;
|
||||||
import rx.observers.TestSubscriber;
|
import rx.observers.TestSubscriber;
|
||||||
|
|
||||||
class SingleJustVsFromCallableTest {
|
class SingleJustVsFromCallableUnitTest {
|
||||||
|
|
||||||
public EmployeeRepository repository = mock(EmployeeRepository.class);
|
public EmployeeRepository repository = mock(EmployeeRepository.class);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue