Merge reactor#1274 reactor#896 into 3.2

liulangf · Jul 9, 2018 · 28566cf · 28566cf
2 parents f04f7cb + e239d65
commit 28566cf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,16 +17,18 @@ import me.champeau.gradle.japicmp.JapicmpTask
 import org.gradle.api.internal.plugins.osgi.OsgiHelper
 
 buildscript {
-  ext.kotlinVersion = '1.1.61'
+  ext.kotlinVersion = '1.2.51'
   repositories {
 	maven { url "http://repo.spring.io/plugins-release" }
   }
   dependencies {
-	classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7',
-			'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE',
-			'com.github.jengelman.gradle.plugins:shadow:1.2.0',
-			'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.11',
-			"org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
+	classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
+	classpath 'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE'
+	classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.0'
+	classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
+	classpath 'org.jruby:jruby-complete:9.1.17.0'
+	classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.7'
+	classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
   }
 }
 
@@ -420,8 +422,7 @@ project('reactor-core') {
 	archives sourcesJar
 	archives javadocJar
 	archives docsZip
-	if (!JavaVersion.current().isJava9Compatible())
-	  archives kdocZip
+	archives kdocZip
   }
 
   jacocoTestReport.dependsOn test
@@ -540,8 +541,7 @@ project('reactor-test') {
   }
 
   artifacts {
-	if (!JavaVersion.current().isJava9Compatible())
-	  archives kdocZip
+	archives kdocZip
   }
 
   jar.finalizedBy(japicmp)

diff --git a/gradle/doc.gradle b/gradle/doc.gradle
@@ -21,13 +21,7 @@ configure(rootProject) {
 			include "index.asciidoc"
 		}
 		outputDir file("$buildDir/reactor-code/build/asciidoc")
-		//TODO remove once a working combination of asciidoctorj, asciidoctorj-pdf and asciidoctor-gradle-plugin is found
-		if (JavaVersion.current().isJava9Compatible()) {
-		  backends = ['html5']
-		}
-		else {
-		  backends = ['html5', 'pdf']
-		}
+	  backends = ['html5', 'pdf']
 		logDocuments = true
 		options = [
 				doctype: 'book'

diff --git a/reactor-core/src/test/java/reactor/core/publisher/FluxMergeOrderedTest.java b/reactor-core/src/test/java/reactor/core/publisher/FluxMergeOrderedTest.java
@@ -307,7 +307,7 @@ public void scanMain() {
 		CoreSubscriber<? super Integer> actual = new LambdaSubscriber<>(null, null, null, null);
 
 		FluxMergeOrdered.MergeOrderedMainProducer<Integer> test =
-				new FluxMergeOrdered.MergeOrderedMainProducer<>(actual, Comparator.naturalOrder(), 123, 4);
+				new FluxMergeOrdered.MergeOrderedMainProducer<Integer>(actual, Comparator.naturalOrder(), 123, 4);
 
 		assertThat(test.scan(Scannable.Attr.ACTUAL))
 				.isSameAs(actual)
@@ -334,7 +334,7 @@ public void scanMain() {
 	public void scanInner() {
 		CoreSubscriber<? super Integer> actual = new LambdaSubscriber<>(null, null, null, null);
 		FluxMergeOrdered.MergeOrderedMainProducer<Integer> main =
-				new FluxMergeOrdered.MergeOrderedMainProducer<>(actual, Comparator.naturalOrder(), 123, 4);
+				new FluxMergeOrdered.MergeOrderedMainProducer<Integer>(actual, Comparator.naturalOrder(), 123, 4);
 
 		FluxMergeOrdered.MergeOrderedInnerSubscriber<Integer> test = new FluxMergeOrdered.MergeOrderedInnerSubscriber<>(
 				main, 123);
@@ -363,7 +363,7 @@ public void mainSubscribersDifferentCountInners() {
 		CoreSubscriber<? super Integer> actual = new LambdaSubscriber<>(null, null, null, null);
 
 		FluxMergeOrdered.MergeOrderedMainProducer<Integer> test =
-				new FluxMergeOrdered.MergeOrderedMainProducer<>(actual, Comparator.naturalOrder(), 123, 4);
+				new FluxMergeOrdered.MergeOrderedMainProducer<Integer>(actual, Comparator.naturalOrder(), 123, 4);
 
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> {
@@ -378,7 +378,7 @@ public void mainSubscribersDifferentCountInners() {
 	public void innerRequestAmountIgnoredAssumedOne() {
 		CoreSubscriber<? super Integer> actual = new LambdaSubscriber<>(null, null, null, null);
 		FluxMergeOrdered.MergeOrderedMainProducer<Integer> main =
-				new FluxMergeOrdered.MergeOrderedMainProducer<>(actual, Comparator.naturalOrder(), 123, 4);
+				new FluxMergeOrdered.MergeOrderedMainProducer<Integer>(actual, Comparator.naturalOrder(), 123, 4);
 
 		FluxMergeOrdered.MergeOrderedInnerSubscriber<Integer> test = new FluxMergeOrdered.MergeOrderedInnerSubscriber<>(
 				main, 4);