Skip to content

Commit

Permalink
Issue ReactiveX#421: Upgraded to Gradle 5.3.1 (ReactiveX#422)
Browse files Browse the repository at this point in the history
  • Loading branch information
RobWin authored Apr 12, 2019
1 parent 30a00cd commit 193b064
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 67 deletions.
44 changes: 5 additions & 39 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
buildscript {
repositories {
jcenter()
mavenCentral()
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'me.champeau.gradle:jmh-gradle-plugin:0.3.1'
classpath "org.asciidoctor:asciidoctor-gradle-plugin:1.5.3"
classpath "org.ajoberstar:gradle-git:1.3.2"
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.4.17"
classpath 'com.github.erizo.gradle:jcstress-gradle-plugin:0.8.0'
classpath "com.netflix.nebula:gradle-extra-configurations-plugin:4.0.1"
}
}
plugins {
id "org.sonarqube" version "2.7"
id "com.jfrog.bintray" version "1.8.4"
id "me.champeau.gradle.jmh" version "0.4.8"
id 'org.asciidoctor.convert' version '1.6.0'
id "com.jfrog.artifactory" version "4.9.5"
}
apply plugin: 'idea'
apply from: "${rootDir}/libraries.gradle"
Expand Down Expand Up @@ -55,15 +41,14 @@ configure(project.coreProjects) {
apply plugin: 'maven-publish'
apply plugin: 'com.jfrog.bintray'
apply from: "${rootDir}/publishing.gradle"
apply plugin: 'nebula.optional-base'
apply plugin: 'jacoco'

dependencies {
compile ( libraries.vavr)
compile ( libraries.slf4j)

// JSR-305 only used for non-required meta-annotations
compile "com.google.code.findbugs:jsr305:3.0.2", optional
compileOnly "com.google.code.findbugs:jsr305:3.0.2"

testCompile ( libraries.junit)
testCompile ( libraries.assertj)
Expand All @@ -73,9 +58,6 @@ configure(project.coreProjects) {
testCompile ( libraries.powermock_api_mockito)
testCompile ( libraries.powermock_module_junit4)
testCompile ( libraries.awaitility)

jmh "org.openjdk.jmh:jmh-core:1.18"
jmh "org.openjdk.jmh:jmh-generator-annprocess:1.18"
}

tasks.withType(JavaCompile) {
Expand All @@ -89,34 +71,22 @@ configure(project.coreProjects) {

jmh {
duplicateClassesStrategy = 'warn'
jmhVersion = '1.17'
}
}

sonarqube {
properties {
property "sonar.projectName", "resilience4j"
property "sonar.projectKey", "resilience4j_resilience4j"
property "sonar.modules", "resilience4j-core,resilience4j-feign,resilience4j-metrics,resilience4j-micrometer,resilience4j-prometheus,resilience4j-retry,resilience4j-spring,resilience4j-timelimiter,resilience4j-bulkhead,resilience4j-circuitbreaker,resilience4j-ratelimiter,resilience4j-cache,resilience4j-circularbuffer,resilience4j-consumer,resilience4j-spring-boot,resilience4j-spring-boot2,resilience4j-reactor,resilience4j-rxjava2"
property "sonar.projectVersion","0.15.0-SNAPSHOTS"

property "sonar.links.homepage","https://github.com/resilience4j/resilience4j"
property "sonar.links.ci","https://travis-ci.org/resilience4j/resilience4j"
property "sonar.links.scm","https://github.com/resilience4j/resilience4j"
property "sonar.links.issue","https://github.com/resilience4j/resilience4j/issues"

property "sonar.java.source","1.8"
property "sonar.sources","src/main/java"
property "sonar.tests","src/test/java"
property "sonar.java.binaries","build"
property "sonar.java.test.binaries","build"
property "sonar.binaries","build"
// property "sonar.jacoco.reportPaths","build/reports/jacoco/test"

property "sonar.language","java"


property "sonar.sourceEncoding","UTF-8"
}
}
def allTestCoverageFile = "$buildDir/jacoco/allTestCoverage.exec"
Expand Down Expand Up @@ -145,10 +115,6 @@ test {
dependsOn(subprojects.test) // required by cobertura to aggregate report
}

task wrapper(type: Wrapper) {
gradleVersion = '4.10.2'
}

artifactory {
contextUrl = 'https://oss.jfrog.org'
resolve {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 0 additions & 2 deletions resilience4j-all/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
apply plugin: 'me.champeau.gradle.jmh'

dependencies {
compile project(':resilience4j-core')
compile project(':resilience4j-ratelimiter')
Expand Down
4 changes: 0 additions & 4 deletions resilience4j-bulkhead/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
apply plugin: 'jcstress'

dependencies {
compile project(':resilience4j-core')
testCompile project(':resilience4j-test')
testCompile project(':resilience4j-rxjava2')
jmh project(':resilience4j-rxjava2')
jcstress project(':resilience4j-rxjava2')
testCompile ( libraries.rxjava2)
jcstress ( libraries.rxjava2 )
}
4 changes: 0 additions & 4 deletions resilience4j-circuitbreaker/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
apply plugin: 'jcstress'

dependencies {
compile project(':resilience4j-core')
testCompile project(':resilience4j-test')
jmh project(':resilience4j-rxjava2')
jcstress project(':resilience4j-rxjava2')
testCompile ( libraries.rxjava2 )
jcstress ( libraries.rxjava2 )
}
1 change: 0 additions & 1 deletion resilience4j-circularbuffer/build.gradle
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
apply plugin: 'jcstress'
16 changes: 1 addition & 15 deletions resilience4j-documentation/build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
apply plugin: 'org.asciidoctor.convert'
apply plugin: 'org.ajoberstar.github-pages'

artifactoryPublish.skip=true
sonarqube.skipProject=true

asciidoctor.dependsOn test
publishGhPages.dependsOn asciidoctor

githubPages {
repoUri = 'https://github.com/resilience4j/resilience4j.git'

credentials {
username = project.hasProperty('githubUser') ? project.githubUser : System.getenv('GITHUB_USER')
password = project.hasProperty('githubPassword') ? project.githubPassword : System.getenv('GITHUB_PASSWORD')
}

pages {
from file(asciidoctor.outputDir.path + '/html5')
}
}

asciidoctor {
sources {
Expand Down
3 changes: 2 additions & 1 deletion resilience4j-test/build.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
artifactoryPublish.skip = true
artifactoryPublish.skip = true
sonarqube.skipProject=true

0 comments on commit 193b064

Please sign in to comment.