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

16
spring-boot-tests/spring-boot-integration-tests/spring-boot-configuration-processor-tests/build.gradle
View File

@@ -1,17 +1,17 @@
plugins {
id 'java'
id 'org.springframework.boot.conventions'
id "java"
id "org.springframework.boot.conventions"
}
description = "Spring Boot Configuration Processor Tests"
dependencies {
annotationProcessor project(':spring-boot-project:spring-boot-tools:spring-boot-configuration-processor')
annotationProcessor project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-processor")
implementation enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies'))
implementation project(':spring-boot-project:spring-boot')
implementation 'jakarta.validation:jakarta.validation-api'
implementation enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))
implementation project(":spring-boot-project:spring-boot")
implementation "jakarta.validation:jakarta.validation-api"
testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')
testImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata')
testImplementation project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")
testImplementation project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata")
}

12
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/build.gradle
View File

@@ -1,19 +1,19 @@
plugins {
id 'java'
id 'org.springframework.boot'
id "java"
id "org.springframework.boot"
}
apply plugin: 'io.spring.dependency-management'
apply plugin: "io.spring.dependency-management"
repositories {
maven { url "file:${rootDir}/../int-test-maven-repository"}
mavenCentral()
maven { url 'https://repo.spring.io/snapshot' }
maven { url 'https://repo.spring.io/milestone' }
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation "org.springframework.boot:spring-boot-starter-web"
}
bootJar {

6
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/app/settings.gradle
View File

@@ -2,12 +2,12 @@ pluginManagement {
repositories {
maven { url "file:${rootDir}/../int-test-maven-repository"}
mavenCentral()
maven { url 'https://repo.spring.io/snapshot' }
maven { url 'https://repo.spring.io/milestone' }
maven { url "https://repo.spring.io/snapshot" }
maven { url "https://repo.spring.io/milestone" }
}
resolutionStrategy {
eachPlugin {
if (requested.id.id == 'org.springframework.boot') {
if (requested.id.id == "org.springframework.boot") {
useModule "org.springframework.boot:spring-boot-gradle-plugin:${requested.version}"
}
}

22
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
View File

@@ -1,7 +1,7 @@
plugins {
id 'java'
id 'org.springframework.boot.conventions'
id 'org.springframework.boot.integration-test'
id "java"
id "org.springframework.boot.conventions"
id "org.springframework.boot.integration-test"
}
description = "Spring Boot Launch Script Integration Tests"
@@ -11,13 +11,13 @@ configurations {
}
dependencies {
app project(path: ':spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin', configuration: 'mavenRepository')
app project(path: ':spring-boot-project:spring-boot-starters:spring-boot-starter-web', configuration: 'mavenRepository')
app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository")
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-web", configuration: "mavenRepository")
intTestImplementation enforcedPlatform(project(':spring-boot-project:spring-boot-parent'))
intTestImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support')
intTestImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')
intTestImplementation 'org.testcontainers:testcontainers'
intTestImplementation enforcedPlatform(project(":spring-boot-project:spring-boot-parent"))
intTestImplementation project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")
intTestImplementation project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")
intTestImplementation "org.testcontainers:testcontainers"
}
task syncMavenRepository(type: Sync) {
@@ -26,7 +26,7 @@ task syncMavenRepository(type: Sync) {
}
task syncAppSource(type: Sync) {
from 'app'
from "app"
into "${buildDir}/app"
filter { line ->
line.replace("id 'org.springframework.boot'", "id 'org.springframework.boot' version '${project.version}'")
@@ -37,7 +37,7 @@ task buildApp(type: GradleBuild) {
dependsOn syncAppSource, syncMavenRepository
dir = "${buildDir}/app"
startParameter.buildCacheEnabled = false
tasks = ['build']
tasks = ["build"]
}
intTest {

43
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle
View File

@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.springframework.boot.conventions'
id "java"
id "org.springframework.boot.conventions"
}
description = "Spring Boot Server Tests"
@@ -10,33 +10,32 @@ configurations {
}
dependencies {
testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')
testImplementation project(':spring-boot-project:spring-boot-tools:spring-boot-test-support')
testImplementation 'com.samskivert:jmustache'
testImplementation 'jakarta.servlet:jakarta.servlet-api'
testImplementation 'org.apache.httpcomponents:httpasyncclient'
testImplementation 'org.apache.maven.shared:maven-invoker:3.0.0'
testImplementation 'org.awaitility:awaitility'
testImplementation('org.eclipse.jetty:jetty-webapp') {
exclude group: 'javax.servlet', module: 'javax-servlet-api'
testImplementation project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")
testImplementation project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")
testImplementation "com.samskivert:jmustache"
testImplementation "jakarta.servlet:jakarta.servlet-api"
testImplementation "org.apache.httpcomponents:httpasyncclient"
testImplementation "org.apache.maven.shared:maven-invoker:3.0.0"
testImplementation "org.awaitility:awaitility"
testImplementation("org.eclipse.jetty:jetty-webapp") {
exclude group: "javax.servlet", module: "javax-servlet-api"
}
testImplementation 'org.springframework:spring-web'
testImplementation "org.springframework:spring-web"
testRepository project(path: ':spring-boot-project:spring-boot-dependencies', configuration: 'mavenRepository')
testRepository project(path: ':spring-boot-project:spring-boot-tools:spring-boot-maven-plugin', configuration: 'mavenRepository')
testRepository project(path: ':spring-boot-project:spring-boot-starters:spring-boot-starter', configuration: 'mavenRepository')
testRepository project(path: ':spring-boot-project:spring-boot-starters:spring-boot-starter-jetty', configuration: 'mavenRepository')
testRepository project(path: ':spring-boot-project:spring-boot-starters:spring-boot-starter-parent', configuration: 'mavenRepository')
testRepository project(path: ':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat', configuration: 'mavenRepository')
testRepository project(path: ':spring-boot-project:spring-boot-starters:spring-boot-starter-undertow', configuration: 'mavenRepository')
testRepository project(path: ":spring-boot-project:spring-boot-dependencies", configuration: "mavenRepository")
testRepository project(path: ":spring-boot-project:spring-boot-tools:spring-boot-maven-plugin", configuration: "mavenRepository")
testRepository project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository")
testRepository project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-jetty", configuration: "mavenRepository")
testRepository project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-parent", configuration: "mavenRepository")
testRepository project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat", configuration: "mavenRepository")
testRepository project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-undertow", configuration: "mavenRepository")
testRuntimeOnly project(':spring-boot-project:spring-boot-starters:spring-boot-starter-logging')
testRuntimeOnly project(":spring-boot-project:spring-boot-starters:spring-boot-starter-logging")
}
task prepareMavenBinaries(type: org.springframework.boot.build.mavenplugin.PrepareMavenBinaries) {
outputDir = file("${buildDir}/maven-binaries")
versions '3.6.2'
versions "3.6.2"
}
task syncTestRepository(type: Sync) {