diff --git a/build.gradle b/build.gradle index 33cd3953..d32ebc7c 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ */ plugins { - id "io.spring.nohttp" + id 'io.spring.nohttp' } ext { @@ -34,38 +34,44 @@ nohttp { configure(allprojects) { group = "org.springframework.cloud" - apply plugin: "java" - apply plugin: "eclipse" - apply plugin: "idea" + apply plugin: 'java' + apply plugin: 'eclipse' + apply plugin: 'idea' repositories { mavenCentral() - maven { url "https://repo.spring.io/release" } + maven { url 'https://repo.spring.io/release' } } if (version =~ /((-M|-RC)[0-9]+|-SNAPSHOT)$/) { repositories { - maven { url "https://repo.spring.io/milestone" } - } + maven { url 'https://repo.spring.io/milestone' } } + } if (version.endsWith('-SNAPSHOT')) { - repositories { - maven { url "https://repo.spring.io/snapshot" } - } + repositories { + maven { url 'https://repo.spring.io/snapshot' } } + } + + configurations { + all { + exclude group: 'commons-logging', module: 'commons-logging' + } + } } -configure(allprojects - [project(":spring-cloud-open-service-broker-acceptance-webflux"), - project(":spring-cloud-open-service-broker-acceptance-webmvc"), - project(":spring-cloud-open-service-broker-contract-tests"), - project(":spring-cloud-open-service-broker-docs")]) { - apply plugin: "java-library" +configure(allprojects - [project(':spring-cloud-open-service-broker-acceptance-webflux'), + project(':spring-cloud-open-service-broker-acceptance-webmvc'), + project(':spring-cloud-open-service-broker-contract-tests'), + project(':spring-cloud-open-service-broker-docs')]) { + apply plugin: 'java-library' apply from: "${rootProject.projectDir}/publish-maven.gradle" - apply plugin: "jacoco" + apply plugin: 'jacoco' } -configure(allprojects - [project(":spring-cloud-open-service-broker-docs")]) { - apply plugin: "checkstyle" - apply plugin: "pmd" +configure(allprojects - [project(':spring-cloud-open-service-broker-docs')]) { + apply plugin: 'checkstyle' + apply plugin: 'pmd' checkstyle { configFile = rootProject.file("src/checkstyle/checkstyle.xml") @@ -107,7 +113,7 @@ subprojects { task dependencyReport(type: DependencyReportTask) } -configure(subprojects - [project(":spring-cloud-starter-open-service-broker")]) { +configure(subprojects - [project(':spring-cloud-starter-open-service-broker')]) { [compileJava, compileTestJava]*.options*.encoding = "UTF-8" [compileJava, compileTestJava]*.options*.compilerArgs = [ @@ -179,10 +185,10 @@ configure(rootProject) { } // filter unwanted subprojects from published javadoc - def sourceProjects = subprojects - [project(":spring-cloud-open-service-broker-acceptance-webflux"), - project(":spring-cloud-open-service-broker-acceptance-webmvc"), - project(":spring-cloud-open-service-broker-contract-tests"), - project(":spring-cloud-open-service-broker-docs")] + def sourceProjects = subprojects - [project(':spring-cloud-open-service-broker-acceptance-webflux'), + project(':spring-cloud-open-service-broker-acceptance-webmvc'), + project(':spring-cloud-open-service-broker-contract-tests'), + project(':spring-cloud-open-service-broker-docs')] task apidocs(type: Javadoc) { group = "Documentation" diff --git a/settings.gradle b/settings.gradle index ed8db642..7be0250a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,11 +27,3 @@ include ":spring-cloud-starter-open-service-broker" include ":spring-cloud-open-service-broker-contract-tests" include ":spring-cloud-open-service-broker-acceptance-webflux" include ":spring-cloud-open-service-broker-acceptance-webmvc" - -project(":spring-cloud-open-service-broker-docs").projectDir = "$rootDir/spring-cloud-open-service-broker-docs" as File -project(":spring-cloud-open-service-broker-core").projectDir = "$rootDir/spring-cloud-open-service-broker-core" as File -project(":spring-cloud-open-service-broker-autoconfigure").projectDir = "$rootDir/spring-cloud-open-service-broker-autoconfigure" as File -project(":spring-cloud-starter-open-service-broker").projectDir = "$rootDir/spring-cloud-starter-open-service-broker" as File -project(":spring-cloud-open-service-broker-contract-tests").projectDir = "$rootDir/spring-cloud-open-service-broker-contract-tests" as File -project(":spring-cloud-open-service-broker-acceptance-webflux").projectDir = "$rootDir/spring-cloud-open-service-broker-acceptance-webflux" as File -project(":spring-cloud-open-service-broker-acceptance-webmvc").projectDir = "$rootDir/spring-cloud-open-service-broker-acceptance-webmvc" as File diff --git a/spring-cloud-open-service-broker-acceptance-webflux/build.gradle b/spring-cloud-open-service-broker-acceptance-webflux/build.gradle index 5c184cff..73a73399 100644 --- a/spring-cloud-open-service-broker-acceptance-webflux/build.gradle +++ b/spring-cloud-open-service-broker-acceptance-webflux/build.gradle @@ -15,17 +15,17 @@ */ plugins { - id "org.springframework.boot" + id 'org.springframework.boot' } description = "Spring Cloud Open Service Broker Acceptance WebFlux" dependencies { implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - implementation("org.springframework.boot:spring-boot-starter") - implementation("org.springframework.boot:spring-boot-starter-webflux") - implementation(project(":spring-cloud-starter-open-service-broker")) - testImplementation("org.springframework.boot:spring-boot-starter-test") + implementation 'org.springframework.boot:spring-boot-starter' + implementation 'org.springframework.boot:spring-boot-starter-webflux' + implementation project(':spring-cloud-starter-open-service-broker') + testImplementation 'org.springframework.boot:spring-boot-starter-test' } // don't publish the jar for the acceptance tests project diff --git a/spring-cloud-open-service-broker-acceptance-webmvc/build.gradle b/spring-cloud-open-service-broker-acceptance-webmvc/build.gradle index d7b2486e..f8374d81 100644 --- a/spring-cloud-open-service-broker-acceptance-webmvc/build.gradle +++ b/spring-cloud-open-service-broker-acceptance-webmvc/build.gradle @@ -15,17 +15,17 @@ */ plugins { - id "org.springframework.boot" + id 'org.springframework.boot' } description = "Spring Cloud Open Service Broker Acceptance WebMvc" dependencies { implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - implementation("org.springframework.boot:spring-boot-starter") - implementation("org.springframework.boot:spring-boot-starter-web") - implementation(project(":spring-cloud-starter-open-service-broker")) - testImplementation("org.springframework.boot:spring-boot-starter-test") + implementation 'org.springframework.boot:spring-boot-starter' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation project(':spring-cloud-starter-open-service-broker') + testImplementation 'org.springframework.boot:spring-boot-starter-test' } // don't publish the jar for the acceptance tests project diff --git a/spring-cloud-open-service-broker-autoconfigure/build.gradle b/spring-cloud-open-service-broker-autoconfigure/build.gradle index c993584e..c5163cb8 100644 --- a/spring-cloud-open-service-broker-autoconfigure/build.gradle +++ b/spring-cloud-open-service-broker-autoconfigure/build.gradle @@ -21,20 +21,20 @@ dependencies { implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") annotationProcessor enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - api(project(":spring-cloud-open-service-broker-core")) - optionalApi("org.springframework.boot:spring-boot-starter-web") - optionalApi("org.springframework.boot:spring-boot-starter-webflux") - annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") - annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor") - testImplementation(project(path: ":spring-cloud-open-service-broker-core", configuration: "testOutput")) - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testRuntimeOnly("javax.servlet:javax.servlet-api") - testImplementation("org.mockito:mockito-core") - testImplementation("org.hamcrest:java-hamcrest:${javaHamcrestVersion}") - testImplementation("org.assertj:assertj-core") - testImplementation("org.apache.commons:commons-lang3") + api project(':spring-cloud-open-service-broker-core') + optionalApi 'org.springframework.boot:spring-boot-starter-web' + optionalApi 'org.springframework.boot:spring-boot-starter-webflux' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' + annotationProcessor 'org.springframework.boot:spring-boot-autoconfigure-processor' + testImplementation project(path: ':spring-cloud-open-service-broker-core', configuration: 'testOutput') + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation "io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}" + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testRuntimeOnly 'javax.servlet:javax.servlet-api' + testImplementation 'org.mockito:mockito-core' + testImplementation "org.hamcrest:java-hamcrest:${javaHamcrestVersion}" + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.apache.commons:commons-lang3' } configurations { diff --git a/spring-cloud-open-service-broker-contract-tests/build.gradle b/spring-cloud-open-service-broker-contract-tests/build.gradle index 8726f46f..88358c59 100644 --- a/spring-cloud-open-service-broker-contract-tests/build.gradle +++ b/spring-cloud-open-service-broker-contract-tests/build.gradle @@ -17,13 +17,13 @@ import org.springframework.cloud.contract.verifier.config.TestFramework */ plugins { - id "io.spring.dependency-management" version "1.0.9.RELEASE" - id "org.springframework.cloud.contract" version "${springCloudContractVersion}" + id 'io.spring.dependency-management' version '1.0.9.RELEASE' + id 'org.springframework.cloud.contract' version "${springCloudContractVersion}" } description = "Spring Cloud Open Service Broker Contract Tests" -apply plugin: "groovy" +apply plugin: 'groovy' contracts { packageWithBaseClasses = "org.springframework.cloud.servicebroker.contract" @@ -39,12 +39,12 @@ dependencyManagement { } dependencies { - testImplementation(project(":spring-cloud-starter-open-service-broker")) - testImplementation("org.springframework.boot:spring-boot-starter-web") - testImplementation("org.springframework.boot:spring-boot-starter-webflux") - testImplementation(project(path: ":spring-cloud-open-service-broker-autoconfigure", configuration: "testOutput")) - testImplementation("org.springframework.boot:spring-boot-starter-test") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testImplementation("org.springframework.cloud:spring-cloud-starter-contract-verifier") - testRuntimeOnly("javax.servlet:javax.servlet-api") + testImplementation project(':spring-cloud-starter-open-service-broker') + testImplementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-webflux' + testImplementation project(path: ':spring-cloud-open-service-broker-autoconfigure', configuration: 'testOutput') + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testImplementation 'org.springframework.cloud:spring-cloud-starter-contract-verifier' + testRuntimeOnly 'javax.servlet:javax.servlet-api' } diff --git a/spring-cloud-open-service-broker-core/build.gradle b/spring-cloud-open-service-broker-core/build.gradle index 8761ad67..09134006 100644 --- a/spring-cloud-open-service-broker-core/build.gradle +++ b/spring-cloud-open-service-broker-core/build.gradle @@ -20,32 +20,28 @@ dependencies { // BOM imports - The versions used in these files will override any other versions found in the graph implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - compileOnly("javax.servlet:javax.servlet-api") - api("org.springframework:spring-context") - optionalApi("org.springframework:spring-web") - optionalApi("org.springframework:spring-webflux") - api("io.projectreactor:reactor-core") - api("com.fasterxml.jackson.core:jackson-databind") - api("org.hibernate.validator:hibernate-validator") - api("commons-beanutils:commons-beanutils:${beanUtilsVersion}") { - exclude group:"commons-logging", module:"commons-logging" - } - api("org.slf4j:slf4j-api") - testImplementation("org.springframework:spring-test") { - exclude group:"commons-logging", module:"commons-logging" - } - testImplementation("io.projectreactor:reactor-test") - testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.assertj:assertj-core") - testImplementation("org.hamcrest:hamcrest-library") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") - testImplementation("com.jayway.jsonpath:json-path") - testImplementation("nl.jqno.equalsverifier:equalsverifier:${equalsVerifierVersion}") - testImplementation("javax.servlet:javax.servlet-api") + compileOnly 'javax.servlet:javax.servlet-api' + api 'org.springframework:spring-context' + optionalApi 'org.springframework:spring-web' + optionalApi 'org.springframework:spring-webflux' + api 'io.projectreactor:reactor-core' + api 'com.fasterxml.jackson.core:jackson-databind' + api 'org.hibernate.validator:hibernate-validator' + api "commons-beanutils:commons-beanutils:${beanUtilsVersion}" + api 'org.slf4j:slf4j-api' + testImplementation 'org.springframework:spring-test' + testImplementation 'io.projectreactor:reactor-test' + testImplementation "io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}" + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.hamcrest:hamcrest-library' + testImplementation 'org.mockito:mockito-core' + testImplementation 'org.mockito:mockito-junit-jupiter' + testImplementation 'com.jayway.jsonpath:json-path' + testImplementation "nl.jqno.equalsverifier:equalsverifier:${equalsVerifierVersion}" + testImplementation 'javax.servlet:javax.servlet-api' } configurations { diff --git a/spring-cloud-open-service-broker-docs/build.gradle b/spring-cloud-open-service-broker-docs/build.gradle index 5c0885a8..2c9ae666 100644 --- a/spring-cloud-open-service-broker-docs/build.gradle +++ b/spring-cloud-open-service-broker-docs/build.gradle @@ -29,12 +29,12 @@ dependencies { // BOM imports - The versions used in these files will override any other versions found in the graph implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - implementation(project(":spring-cloud-open-service-broker-core")) - implementation("org.springframework.boot:spring-boot-starter") - implementation("org.springframework.boot:spring-boot-starter-security") - implementation("org.springframework.boot:spring-boot-starter-tomcat") - implementation("io.projectreactor:reactor-core") - docs("io.spring.docresources:spring-doc-resources:0.2.1.RELEASE@zip") + implementation project(':spring-cloud-open-service-broker-core') + implementation 'org.springframework.boot:spring-boot-starter' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-tomcat' + implementation 'io.projectreactor:reactor-core' + docs 'io.spring.docresources:spring-doc-resources:0.2.1.RELEASE@zip' } javadoc { diff --git a/spring-cloud-starter-open-service-broker/build.gradle b/spring-cloud-starter-open-service-broker/build.gradle index 802cf7d4..de8b402c 100644 --- a/spring-cloud-starter-open-service-broker/build.gradle +++ b/spring-cloud-starter-open-service-broker/build.gradle @@ -17,8 +17,8 @@ description = "Spring Cloud Open Service Broker Starter" dependencies { - api("org.springframework.boot:spring-boot-starter:${springBootVersion}") - api(project(":spring-cloud-open-service-broker-autoconfigure")) + api 'org.springframework.boot:spring-boot-starter:${springBootVersion}' + api project(':spring-cloud-open-service-broker-autoconfigure') } generatePomFileForMavenJavaPublication {