Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish quote form used in Gradle scripts

Browse Source 
Replace Gradle single quote strings with the double quote form
whenever possible. The change helps to being consistency to the
dependencies section where mostly single quotes were used, but
occasionally double quotes were required due to `${}` references.
This commit is contained in:
Phillip Webb
2020-01-22 11:24:37 -08:00
parent ed6fbc6bec
commit 0209cd3e4c
175 changed files with 3207 additions and 3208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle
View File

@@ -1,14 +1,14 @@
plugins {
id 'java-library'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.deployed'
id 'org.springframework.boot.internal-dependency-management'
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.internal-dependency-management"
}
description = 'Spring Boot Antlib'
description = "Spring Boot Antlib"
ext {
antVersion = '1.9.3'
antVersion = "1.9.3"
}
configurations {
@@ -17,12 +17,12 @@ configurations {
}
dependencies {
antUnit 'org.apache.ant:ant-antunit:1.3'
antIvy 'org.apache.ivy:ivy:2.4.0'
antUnit "org.apache.ant:ant-antunit:1.3"
antIvy "org.apache.ivy:ivy:2.4.0"
api platform(project(':spring-boot-project:spring-boot-dependencies'))
api platform(project(":spring-boot-project:spring-boot-dependencies"))
compileOnly project(':spring-boot-project:spring-boot-tools:spring-boot-loader')
compileOnly project(":spring-boot-project:spring-boot-tools:spring-boot-loader")
compileOnly "org.apache.ant:ant:${antVersion}"
implementation project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")

19
spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/build.gradle
View File

@@ -1,16 +1,15 @@
plugins {
id 'java-library'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.deployed'
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}
description = 'Spring Boot AutoConfigure Annotation Processor'
description = "Spring Boot AutoConfigure Annotation Processor"
dependencies {
testImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies'))
testImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support')
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.springframework:spring-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))
testImplementation project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")
testImplementation "org.assertj:assertj-core"
testImplementation "org.springframework:spring-core"
testImplementation "org.junit.jupiter:junit-jupiter"
}

42
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle
View File

@@ -1,28 +1,28 @@
plugins {
id 'java-library'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.deployed'
id 'org.springframework.boot.internal-dependency-management'
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.internal-dependency-management"
}
description = 'Spring Boot Buildpack Platform'
description = "Spring Boot Buildpack Platform"
dependencies {
api platform(project(':spring-boot-project:spring-boot-parent'))
api 'com.fasterxml.jackson.core:jackson-databind'
api 'com.fasterxml.jackson.module:jackson-module-parameter-names'
api 'net.java.dev.jna:jna-platform'
api 'org.apache.commons:commons-compress:1.19'
api 'org.apache.httpcomponents:httpclient'
api 'org.springframework:spring-core'
api platform(project(":spring-boot-project:spring-boot-parent"))
api "com.fasterxml.jackson.core:jackson-databind"
api "com.fasterxml.jackson.module:jackson-module-parameter-names"
api "net.java.dev.jna:jna-platform"
api "org.apache.commons:commons-compress:1.19"
api "org.apache.httpcomponents:httpclient"
api "org.springframework:spring-core"
testImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support')
testImplementation 'com.jayway.jsonpath:json-path'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.testcontainers:testcontainers'
testImplementation 'org.hamcrest:hamcrest'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.mockito:mockito-core'
testImplementation 'org.mockito:mockito-junit-jupiter'
testImplementation 'org.skyscreamer:jsonassert'
testImplementation project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")
testImplementation "com.jayway.jsonpath:json-path"
testImplementation "org.assertj:assertj-core"
testImplementation "org.testcontainers:testcontainers"
testImplementation "org.hamcrest:hamcrest"
testImplementation "org.junit.jupiter:junit-jupiter"
testImplementation "org.mockito:mockito-core"
testImplementation "org.mockito:mockito-junit-jupiter"
testImplementation "org.skyscreamer:jsonassert"
}

10
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/build.gradle
View File

@@ -1,11 +1,11 @@
plugins {
id 'java-library'
id 'maven-publish'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.internal-dependency-management'
id "java-library"
id "maven-publish"
id "org.springframework.boot.conventions"
id "org.springframework.boot.internal-dependency-management"
}
description = 'Spring Boot Configuration Metadata'
description = "Spring Boot Configuration Metadata"
dependencies {
api platform(project(path: ":spring-boot-project:spring-boot-parent"))

8
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/build.gradle
View File

@@ -1,10 +1,10 @@
plugins {
id 'java-library'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.deployed'
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
}
description = 'Spring Boot Configuration Annotation Processor'
description = "Spring Boot Configuration Annotation Processor"
sourceSets {
main {

78
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@@ -1,15 +1,15 @@
plugins {
id 'java-gradle-plugin'
id 'maven-publish'
id 'org.asciidoctor.jvm.convert'
id 'org.asciidoctor.jvm.pdf'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.internal-dependency-management'
id 'org.springframework.boot.maven-repository'
id 'org.springframework.boot.optional-dependencies'
id "java-gradle-plugin"
id "maven-publish"
id "org.asciidoctor.jvm.convert"
id "org.asciidoctor.jvm.pdf"
id "org.springframework.boot.conventions"
id "org.springframework.boot.internal-dependency-management"
id "org.springframework.boot.maven-repository"
id "org.springframework.boot.optional-dependencies"
}
description = 'Spring Boot Gradle Plugin'
description = "Spring Boot Gradle Plugin"
configurations {
asciidoctorExtensions
@@ -18,68 +18,68 @@ configurations {
repositories {
maven {
url 'https://repo.spring.io/release'
url "https://repo.spring.io/release"
mavenContent {
includeGroup 'io.spring.asciidoctor'
includeGroup "io.spring.asciidoctor"
}
}
}
dependencies {
api platform(project(':spring-boot-project:spring-boot-dependencies'))
api platform(project(":spring-boot-project:spring-boot-dependencies"))
asciidoctorExtensions 'io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.3.0.RELEASE'
asciidoctorExtensions "io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.3.0.RELEASE"
implementation project(':spring-boot-project:spring-boot-tools:spring-boot-loader-tools')
implementation 'io.spring.gradle:dependency-management-plugin'
implementation 'org.apache.commons:commons-compress'
implementation 'org.springframework:spring-core'
implementation project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")
implementation "io.spring.gradle:dependency-management-plugin"
implementation "org.apache.commons:commons-compress"
implementation "org.springframework:spring-core"
optional platform(project(':spring-boot-project:spring-boot-dependencies'))
optional 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50'
optional platform(project(":spring-boot-project:spring-boot-dependencies"))
optional "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.mockito:mockito-core'
testImplementation "org.junit.jupiter:junit-jupiter"
testImplementation "org.assertj:assertj-core"
testImplementation "org.mockito:mockito-core"
}
gradlePlugin {
plugins {
springBootPlugin {
id = 'org.springframework.boot'
implementationClass = 'org.springframework.boot.gradle.plugin.SpringBootPlugin'
id = "org.springframework.boot"
implementationClass = "org.springframework.boot.gradle.plugin.SpringBootPlugin"
}
}
}
jar {
manifest {
attributes 'Implementation-Version': project.version
attributes "Implementation-Version": project.version
}
}
task dependencyVersions(type: org.springframework.boot.build.constraints.ExtractVersionConstraints) {
enforcedPlatform(':spring-boot-project:spring-boot-dependencies')
enforcedPlatform(":spring-boot-project:spring-boot-dependencies")
}
tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
dependsOn dependencyVersions
doFirst {
attributes 'dependency-management-plugin-version': dependencyVersions.versionConstraints['io.spring.gradle:dependency-management-plugin']
attributes "dependency-management-plugin-version": dependencyVersions.versionConstraints["io.spring.gradle:dependency-management-plugin"]
}
}
asciidoctor {
configurations 'asciidoctorExtensions'
configurations "asciidoctorExtensions"
sources {
include 'index.adoc'
include "index.adoc"
}
attributes 'stylesheet': 'css/style.css'
attributes "stylesheet": "css/style.css"
}
asciidoctorPdf {
sources {
include 'index.adoc'
include "index.adoc"
}
}
@@ -87,9 +87,9 @@ javadoc {
options {
author = true
docTitle = "Spring Boot Gradle Plugin ${project.version} API"
encoding = 'UTF-8'
memberLevel = 'protected'
outputLevel = 'quiet'
encoding = "UTF-8"
memberLevel = "protected"
outputLevel = "quiet"
splitIndex = true
use = true
windowTitle = "Spring Boot Gradle Plugin ${project.version} API"
@@ -98,18 +98,18 @@ javadoc {
task zip(type: Zip) {
dependsOn asciidoctor, asciidoctorPdf
duplicatesStrategy 'fail'
duplicatesStrategy "fail"
from(asciidoctorPdf.outputDir) {
into 'reference/pdf'
into "reference/pdf"
}
from(asciidoctor.outputDir) {
into 'reference/html'
into "reference/html"
}
from(javadoc) {
into 'api'
into "api"
}
}
artifacts {
'documentation' zip
"documentation" zip
}

18
spring-boot-project/spring-boot-tools/spring-boot-layertools/build.gradle
View File

@@ -1,18 +1,18 @@
plugins {
id 'java-library'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.deployed'
id 'org.springframework.boot.internal-dependency-management'
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.internal-dependency-management"
}
description = 'Spring Boot Layers Tools'
description = "Spring Boot Layers Tools"
dependencies {
api platform(project(':spring-boot-project:spring-boot-parent'))
api platform(project(":spring-boot-project:spring-boot-parent"))
implementation project(':spring-boot-project:spring-boot-tools:spring-boot-loader')
implementation project(':spring-boot-project:spring-boot')
implementation 'org.springframework:spring-core'
implementation project(":spring-boot-project:spring-boot-tools:spring-boot-loader")
implementation project(":spring-boot-project:spring-boot")
implementation "org.springframework:spring-core"
testImplementation "org.assertj:assertj-core"
testImplementation "org.junit.jupiter:junit-jupiter"

14
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
View File

@@ -1,11 +1,11 @@
plugins {
id 'java-library'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.deployed'
id 'org.springframework.boot.internal-dependency-management'
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.internal-dependency-management"
}
description = 'Spring Boot Loader Tools'
description = "Spring Boot Loader Tools"
def generatedResources = "${buildDir}/generated-resources/main"
@@ -14,7 +14,7 @@ configurations {
}
dependencies {
api platform(project(':spring-boot-project:spring-boot-parent'))
api platform(project(":spring-boot-project:spring-boot-parent"))
api "org.apache.commons:commons-compress"
api "org.springframework:spring-core"
@@ -41,7 +41,7 @@ task reproducibleLoaderJar(type: Jar) {
}
reproducibleFileOrder = true
preserveFileTimestamps = false
archiveFileName = 'spring-boot-loader.jar'
archiveFileName = "spring-boot-loader.jar"
destinationDirectory = file("${generatedResources}/META-INF/loader")
}

11
spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle
View File

@@ -1,11 +1,11 @@
plugins {
id 'java-library'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.deployed'
id 'org.springframework.boot.internal-dependency-management'
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.deployed"
id "org.springframework.boot.internal-dependency-management"
}
description = 'Spring Boot Loader'
description = "Spring Boot Loader"
dependencies {
api platform(project(":spring-boot-project:spring-boot-dependencies"))
@@ -13,7 +13,6 @@ dependencies {
compileOnly "org.springframework:spring-core"
testImplementation project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")
testImplementation "org.assertj:assertj-core"
testImplementation "org.awaitility:awaitility"
testImplementation "org.junit.jupiter:junit-jupiter"

72
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
View File

@@ -1,10 +1,10 @@
plugins {
id 'org.asciidoctor.jvm.convert'
id 'org.asciidoctor.jvm.pdf'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.internal-dependency-management'
id 'org.springframework.boot.maven-plugin'
id 'org.springframework.boot.optional-dependencies'
id "org.asciidoctor.jvm.convert"
id "org.asciidoctor.jvm.pdf"
id "org.springframework.boot.conventions"
id "org.springframework.boot.internal-dependency-management"
id "org.springframework.boot.maven-plugin"
id "org.springframework.boot.optional-dependencies"
}
description = "Spring Boot Maven Plugin"
@@ -14,77 +14,77 @@ configurations {
}
dependencies {
api platform(project(':spring-boot-project:spring-boot-parent'))
api project(':spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform')
api platform(project(":spring-boot-project:spring-boot-parent"))
api project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform")
compileOnly 'org.apache.maven.plugin-tools:maven-plugin-annotations'
compileOnly 'org.sonatype.plexus:plexus-build-api'
compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations"
compileOnly "org.sonatype.plexus:plexus-build-api"
implementation project(':spring-boot-project:spring-boot-tools:spring-boot-loader-tools')
implementation 'org.apache.maven.shared:maven-common-artifact-filters'
implementation 'org.apache.maven:maven-plugin-api'
implementation project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools")
implementation "org.apache.maven.shared:maven-common-artifact-filters"
implementation "org.apache.maven:maven-plugin-api"
intTestImplementation platform(project(':spring-boot-project:spring-boot-parent'))
intTestImplementation 'org.apache.maven.shared:maven-invoker'
intTestImplementation 'org.assertj:assertj-core'
intTestImplementation 'org.junit.jupiter:junit-jupiter'
intTestImplementation platform(project(":spring-boot-project:spring-boot-parent"))
intTestImplementation "org.apache.maven.shared:maven-invoker"
intTestImplementation "org.assertj:assertj-core"
intTestImplementation "org.junit.jupiter:junit-jupiter"
optional platform(project(':spring-boot-project:spring-boot-parent'))
optional 'org.apache.maven.plugins:maven-shade-plugin'
optional platform(project(":spring-boot-project:spring-boot-parent"))
optional "org.apache.maven.plugins:maven-shade-plugin"
runtimeOnly 'org.sonatype.plexus:plexus-build-api'
runtimeOnly "org.sonatype.plexus:plexus-build-api"
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.mockito:mockito-core'
testImplementation 'org.springframework:spring-core'
testImplementation "org.assertj:assertj-core"
testImplementation "org.junit.jupiter:junit-jupiter"
testImplementation "org.mockito:mockito-core"
testImplementation "org.springframework:spring-core"
}
syncDocumentationSourceForAsciidoctor {
from(documentPluginGoals) {
into 'asciidoc/goals'
into "asciidoc/goals"
}
}
asciidoctor {
sources {
include 'index.adoc'
include "index.adoc"
}
}
syncDocumentationSourceForAsciidoctorPdf {
from(documentPluginGoals) {
into 'asciidoc/goals'
into "asciidoc/goals"
}
}
asciidoctorPdf {
sources {
include 'index.adoc'
include "index.adoc"
}
}
tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
attributes 'maven-jar-plugin-version': '1.2.3',
'maven-failsafe-plugin-version': '1.2.3',
'build-helper-maven-plugin-version': '1.2.3'
attributes "maven-jar-plugin-version": "1.2.3",
"maven-failsafe-plugin-version": "1.2.3",
"build-helper-maven-plugin-version": "1.2.3"
}
task zip(type: Zip) {
dependsOn asciidoctor, asciidoctorPdf
duplicatesStrategy 'fail'
duplicatesStrategy "fail"
from(asciidoctorPdf.outputDir) {
into 'pdf'
into "pdf"
}
from(asciidoctor.outputDir) {
into 'html'
into "html"
}
}
prepareMavenBinaries {
versions '3.6.2', '3.5.4'
versions "3.6.2", "3.5.4"
}
artifacts {
'documentation' zip
"documentation" zip
}

14
spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle
View File

@@ -1,10 +1,10 @@
plugins {
id 'java-library'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.internal-dependency-management'
id "java-library"
id "org.springframework.boot.conventions"
id "org.springframework.boot.internal-dependency-management"
}
description = 'Spring Boot Testing Support'
description = "Spring Boot Testing Support"
dependencies {
api platform(project(path: ":spring-boot-project:spring-boot-parent"))
@@ -24,7 +24,7 @@ dependencies {
implementation "org.apache.maven.resolver:maven-resolver-impl"
implementation "org.apache.maven:maven-resolver-provider"
implementation("org.apache.maven.resolver:maven-resolver-transport-http") {
exclude group: 'org.slf4j', module: 'jcl-over-slf4j'
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
implementation "org.assertj:assertj-core"
implementation "org.hamcrest:hamcrest-core"
@@ -34,6 +34,6 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter"
testImplementation "org.springframework:spring-context"
testRuntimeOnly 'org.hibernate.validator:hibernate-validator'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testRuntimeOnly "org.hibernate.validator:hibernate-validator"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
}