Misc gradle build files updates

Update Gradle 5.4.1 and kotlin, shadow plugins
Update dev list with @bsideup contact
Remove sourceJar workaround with latest kotlin plugin version

.gitignore

@@ -3,6 +3,7 @@
 
 .gradletasknamecache
 .DS_Store
+benchmarks.jar
 bin
 build
 .classpath

build.gradle

@@ -16,24 +16,24 @@
 import org.gradle.api.internal.plugins.osgi.OsgiHelper
 
 buildscript {
-  ext.kotlinVersion = '1.2.51'
+  ext.kotlinVersion = '1.3.31'
   repositories {
 	maven { url "https://repo.spring.io/plugins-release" }
   }
   dependencies {
 	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 "com.github.jengelman.gradle.plugins:shadow:4.0.2"
+	classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.8"
 	classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
   }
 }
 
 plugins {
   id 'org.asciidoctor.convert' version '1.5.9.2'
-  id "me.champeau.gradle.jmh" version "0.4.7" apply false
   id "me.champeau.gradle.japicmp" version "0.2.6"
   id "de.undercouch.download" version "3.4.3"
-  id "org.unbroken-dome.test-sets" version "1.5.1" apply false // 2.x version does not work with Gradle 4.10
+  id "org.unbroken-dome.test-sets" version "2.1.1" apply false // 2.x version does not work with Gradle 4.10
 }
 
 apply from: "gradle/doc.gradle"
@@ -85,7 +85,7 @@ configure(subprojects) { p ->
   apply plugin: 'kotlin'
   apply plugin: 'jacoco'
   apply plugin: 'propdeps'
-  apply plugin: 'osgi'
+
 
   description = 'Non-Blocking Reactive Foundation for the JVM'
   group = 'io.projectreactor'
@@ -218,12 +218,6 @@ configure(subprojects) { p ->
 	}
   }
 
-  // now that kotlin-gradle-plugin 1.1.60 is out with fix for https://youtrack.jetbrains.com/issue/KT-17564
-  // be wary and fail if the issue of source file duplication in jar comes up again
-  sourcesJar {
-	duplicatesStrategy = DuplicatesStrategy.FAIL
-  }
-
 }
 
 if (project.hasProperty('platformVersion')) {

gradle/doc.gradle

@@ -17,6 +17,9 @@ configure(rootProject) {
 	apply plugin: 'org.asciidoctor.convert'
 
   configure(subprojects) { p ->
+	if (p.name == 'benchmarks')
+	  return
+
 	p.tasks.withType(Javadoc).all {
 	  afterEvaluate {
 		println "JDK Javadoc link for ${p.name} is ${rootProject.jdkJavadoc}"

gradle/setup.gradle

@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-wrapper {
-	group = 'Project Setup'
-	gradleVersion = "4.10.2"
-}
-
 configure(subprojects) { p ->
+
 	apply plugin: 'propdeps-maven'
 	apply plugin: 'maven'
 
@@ -101,9 +97,9 @@ def customizePom(pom, gradleProject) {
 					email = 'sbasle@pivotal.io'
 				}
 				developer {
-					id = 'rsivaram'
-					name = 'Rajini Sivaram'
-					email = 'rsivaram@pivotal.io'
+					id = 'bsideup'
+					name = 'Sergei Egorov'
+					email = 'segorov@pivotal.io'
 				}
 				developer {
 					id = 'sdeleuze'

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

reactor-core/build.gradle

@@ -16,6 +16,7 @@
 import me.champeau.gradle.japicmp.JapicmpTask
 
 apply plugin: 'idea' //needed to avoid IDEA seeing the jmh folder as source
+apply plugin: 'osgi'
 apply plugin: 'me.champeau.gradle.jmh'
 apply plugin: 'org.unbroken-dome.test-sets'
 

reactor-test/build.gradle

@@ -15,6 +15,8 @@
  */
 import me.champeau.gradle.japicmp.JapicmpTask
 
+apply plugin: 'osgi'
+
 description = 'Reactor Test support'
 
 dependencies {