diff --git a/build.gradle b/build.gradle index ed5ad405bf..69a91560cc 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { //we define kotlin version for benefit of both core and test (see kotlin-gradle-plugin below) ext.kotlinVersion = '1.3.72' repositories { - jcenter() + mavenCentral() maven { url "https://repo.spring.io/plugins-release" } } dependencies { @@ -37,12 +37,17 @@ plugins { id "com.jfrog.artifactory" version "4.15.2" apply false id 'biz.aQute.bnd.builder' version '5.0.1' apply false id 'io.spring.nohttp' version '0.0.5.RELEASE' + id "com.github.erizo.gradle.jcstress" version "0.8.8" apply false } apply plugin: "io.reactor.gradle.detect-ci" apply from: "gradle/asciidoc.gradle" //asciidoc (which is generated from root dir) apply from: "gradle/releaser.gradle" +repositories { //needed at root for asciidoctor and nohttp-checkstyle + mavenCentral() +} + ext { jdk = JavaVersion.current().majorVersion jdkJavadoc = "https://docs.oracle.com/javase/$jdk/docs/api/" @@ -110,7 +115,6 @@ configure(subprojects) { p -> repositories { mavenCentral() - jcenter() maven { url "https://oss.sonatype.org/content/repositories/releases/" } mavenLocal() diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index b5e5bd9a99..5150fae13f 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -20,7 +20,6 @@ plugins { repositories { mavenCentral() - jcenter() gradlePluginPortal() } diff --git a/docs/asciidoc/kotlin.adoc b/docs/asciidoc/kotlin.adoc index 1730081447..4c9552f11c 100644 --- a/docs/asciidoc/kotlin.adoc +++ b/docs/asciidoc/kotlin.adoc @@ -13,9 +13,9 @@ This section describes Reactor's support for Kotlin. == Requirements Reactor supports Kotlin 1.1+ and requires -https://bintray.com/bintray/jcenter/org.jetbrains.kotlin%3Akotlin-stdlib[`kotlin-stdlib`] -(or one of its https://bintray.com/bintray/jcenter/org.jetbrains.kotlin%3Akotlin-stdlib-jre7[`kotlin-stdlib-jre7`] -or https://bintray.com/bintray/jcenter/org.jetbrains.kotlin%3Akotlin-stdlib-jre8[`kotlin-stdlib-jre8`] variants). +https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-stdlib[`kotlin-stdlib`] +(or one of its https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-stdlib-jdk7[`kotlin-stdlib-jdk7`] +or https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-stdlib-jdk8[`kotlin-stdlib-jdk8`] variants). [[kotlin-extensions]] == Extensions diff --git a/gradle/asciidoc.gradle b/gradle/asciidoc.gradle index 85a5a40a7a..c8c8e29dca 100644 --- a/gradle/asciidoc.gradle +++ b/gradle/asciidoc.gradle @@ -15,10 +15,6 @@ */ configure(rootProject) { - repositories { - jcenter() - } - apply plugin: 'org.asciidoctor.jvm.convert' apply plugin: 'org.asciidoctor.jvm.pdf' diff --git a/reactor-core/build.gradle b/reactor-core/build.gradle index 7726b31dca..8ba9163d10 100644 --- a/reactor-core/build.gradle +++ b/reactor-core/build.gradle @@ -15,17 +15,6 @@ */ import me.champeau.gradle.japicmp.JapicmpTask -buildscript { - repositories { - jcenter() - } - - dependencies { - // when updating this plugin, revisit pinning the version of the jcstress jar near line 356 - classpath 'com.github.erizo.gradle:jcstress-gradle-plugin:0.8.6' - } -} - apply plugin: 'idea' //needed to avoid IDEA seeing the jmh folder as source apply plugin: 'biz.aQute.bnd.builder' apply plugin: 'org.unbroken-dome.test-sets' @@ -130,7 +119,7 @@ task downloadBaseline(type: Download) { onlyIfNewer true compress true - src "${repositories.jcenter().url}io/projectreactor/reactor-core/$compatibleVersion/reactor-core-${compatibleVersion}.jar" + src "${repositories.mavenCentral().url}io/projectreactor/reactor-core/$compatibleVersion/reactor-core-${compatibleVersion}.jar" dest "${buildDir}/baselineLibs/reactor-core-${compatibleVersion}.jar" } @@ -256,7 +245,6 @@ check.dependsOn japicmp jcstress { mode = 'quick' //quick, default, tough - jcstressDependency = "org.openjdk.jcstress:jcstress-core:0.7" } tasks.check.dependsOn(tasks.jcstress) diff --git a/reactor-test/build.gradle b/reactor-test/build.gradle index fbedded378..76c79a8925 100644 --- a/reactor-test/build.gradle +++ b/reactor-test/build.gradle @@ -55,7 +55,7 @@ task downloadBaseline(type: Download) { onlyIfNewer true compress true - src "${repositories.jcenter().url}io/projectreactor/reactor-test/$compatibleVersion/reactor-test-${compatibleVersion}.jar" + src "${repositories.mavenCentral().url}io/projectreactor/reactor-test/$compatibleVersion/reactor-test-${compatibleVersion}.jar" dest "${buildDir}/baselineLibs/reactor-test-${compatibleVersion}.jar" finalizedBy { japicmp }