Skip to content

Commit

Permalink
Remove jcenter() from build, update jcstress plugin to 0.8.8 (reactor…
Browse files Browse the repository at this point in the history
…#2666)

On top of being used as a repository, JCenter was also used to
retrieve the baseline jars for japicmp. This is now based on Maven
Central.

This also bumps the jcstress-gradle-plugin to 0.8.8 which allows
to unpin the version of jcstress executable. 

See reactor/reactor#695.
  • Loading branch information
simonbasle authored Apr 1, 2021
1 parent e018c73 commit 5090dfd
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 24 deletions.
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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/"
Expand Down Expand Up @@ -110,7 +115,6 @@ configure(subprojects) { p ->

repositories {
mavenCentral()
jcenter()
maven { url "https://oss.sonatype.org/content/repositories/releases/" }

mavenLocal()
Expand Down
1 change: 0 additions & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ plugins {

repositories {
mavenCentral()
jcenter()
gradlePluginPortal()
}

Expand Down
6 changes: 3 additions & 3 deletions docs/asciidoc/kotlin.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions gradle/asciidoc.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
*/

configure(rootProject) {
repositories {
jcenter()
}

apply plugin: 'org.asciidoctor.jvm.convert'
apply plugin: 'org.asciidoctor.jvm.pdf'

Expand Down
14 changes: 1 addition & 13 deletions reactor-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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"
}

Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion reactor-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down

0 comments on commit 5090dfd

Please sign in to comment.