Polish quote styles in gradle files
Replace singe quote-marks with double quote-marks when possible for a more consistent style.
This commit is contained in:
@@ -11,14 +11,14 @@
|
||||
* @param OLD_VERSION_ROOT required, typically pointing to a separate git clone dir
|
||||
*/
|
||||
task jdiff {
|
||||
description = 'Generates a JDiff report'
|
||||
group = 'Documentation'
|
||||
description = "Generates a JDiff report"
|
||||
group = "Documentation"
|
||||
|
||||
def jdiffHome = "${rootProject.rootDir}/gradle/jdiff"
|
||||
|
||||
ant.taskdef(
|
||||
name: 'jdiff',
|
||||
classname: 'jdiff.JDiffAntTask',
|
||||
name: "jdiff",
|
||||
classname: "jdiff.JDiffAntTask",
|
||||
classpath: "${jdiffHome}/antjdiff.jar")
|
||||
|
||||
def previousVersion = rootProject.previousVersion
|
||||
@@ -38,13 +38,13 @@ task jdiff {
|
||||
|
||||
oldVersionRoot = new File(oldVersionRoot)
|
||||
|
||||
ant.property(name: 'JDIFF_HOME', value: jdiffHome)
|
||||
ant.property(name: "JDIFF_HOME", value: jdiffHome)
|
||||
ant.mkdir(dir: outputDir)
|
||||
ant.jdiff(
|
||||
destdir: outputDir,
|
||||
verbose: 'off',
|
||||
stats: 'on',
|
||||
docchanges: 'on') {
|
||||
verbose: "off",
|
||||
stats: "on",
|
||||
docchanges: "on") {
|
||||
old(name: "Spring Framework ${oldVersion}") {
|
||||
oldVersionRoot.eachDirMatch( {
|
||||
def candidate = new File(it)
|
||||
@@ -52,19 +52,19 @@ task jdiff {
|
||||
candidate.name.matches("spring-.*") }) { match ->
|
||||
match.eachDirRecurse { subdir ->
|
||||
if (subdir.path ==~ '.*/src/main/java$') {
|
||||
dirset(dir: subdir.path, includes: 'org/**')
|
||||
dirset(dir: subdir.path, includes: "org/**")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
'new'(name: "Spring Framework ${currentVersion}") {
|
||||
"new"(name: "Spring Framework ${currentVersion}") {
|
||||
currentVersionRoot.eachDirMatch( {
|
||||
def candidate = new File(it)
|
||||
candidate.name.matches("org.springframework.*") ||
|
||||
candidate.name.matches("spring-.*") }) { match ->
|
||||
match.eachDirRecurse { subdir ->
|
||||
if (subdir.path ==~ '.*/src/main/java$') {
|
||||
dirset(dir: subdir.path, includes: 'org/**')
|
||||
dirset(dir: subdir.path, includes: "org/**")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/**
|
||||
* Will merge the artifacts of the current project into mergeIntoProject. For example, to
|
||||
* bundle spring-test-mvc in spring-test's jars. This script will perform the following
|
||||
* bundle spring-test-mvc in spring-test"s jars. This script will perform the following
|
||||
* steps:
|
||||
*
|
||||
* - Ensure that jar tasks of the project being merged from will execute the tasks of the
|
||||
@@ -13,14 +13,14 @@
|
||||
*
|
||||
* Example Usage:
|
||||
*
|
||||
* ext.mergeIntoProject = project(':spring-test')
|
||||
* ext.mergeIntoProject = project(":spring-test")
|
||||
* apply from: "${rootProject.projectDir}/gradle/merge-artifacts.gradle"
|
||||
*/
|
||||
|
||||
def mergeFromProject = project
|
||||
|
||||
// invoking a task on mergeFromProject will invoke the task with the same name on mergeIntoProject
|
||||
def taskNamesToMerge = ['sourcesJar','jar','javadocJar','javadoc','install','artifactoryPublish']
|
||||
def taskNamesToMerge = ["sourcesJar","jar","javadocJar","javadoc","install","artifactoryPublish"]
|
||||
taskNamesToMerge.each { taskName ->
|
||||
def taskToRemove = mergeFromProject.tasks.findByPath(taskName)
|
||||
if(taskToRemove) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
apply plugin: 'maven'
|
||||
apply plugin: "maven"
|
||||
|
||||
ext.optionalDeps = []
|
||||
ext.providedDeps = []
|
||||
@@ -14,45 +14,45 @@ install {
|
||||
|
||||
def customizePom(pom, gradleProject) {
|
||||
pom.whenConfigured { generatedPom ->
|
||||
// respect 'optional' and 'provided' dependencies
|
||||
// respect "optional" and "provided" dependencies
|
||||
gradleProject.optionalDeps.each { dep ->
|
||||
generatedPom.dependencies.findAll { it.artifactId == dep.name }*.optional = true
|
||||
}
|
||||
gradleProject.providedDeps.each { dep ->
|
||||
generatedPom.dependencies.findAll { it.artifactId == dep.name }*.scope = 'provided'
|
||||
generatedPom.dependencies.findAll { it.artifactId == dep.name }*.scope = "provided"
|
||||
}
|
||||
|
||||
// eliminate test-scoped dependencies (no need in maven central poms)
|
||||
generatedPom.dependencies.removeAll { dep ->
|
||||
dep.scope == 'test'
|
||||
dep.scope == "test"
|
||||
}
|
||||
|
||||
// add all items necessary for maven central publication
|
||||
generatedPom.project {
|
||||
name = gradleProject.description
|
||||
description = gradleProject.description
|
||||
url = 'https://github.com/SpringSource/spring-framework'
|
||||
url = "https://github.com/SpringSource/spring-framework"
|
||||
organization {
|
||||
name = 'SpringSource'
|
||||
url = 'http://springsource.org/spring-framework'
|
||||
name = "SpringSource"
|
||||
url = "http://springsource.org/spring-framework"
|
||||
}
|
||||
licenses {
|
||||
license {
|
||||
name 'The Apache Software License, Version 2.0'
|
||||
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
|
||||
distribution 'repo'
|
||||
name "The Apache Software License, Version 2.0"
|
||||
url "http://www.apache.org/licenses/LICENSE-2.0.txt"
|
||||
distribution "repo"
|
||||
}
|
||||
}
|
||||
scm {
|
||||
url = 'https://github.com/SpringSource/spring-framework'
|
||||
connection = 'scm:git:git://github.com/SpringSource/spring-framework'
|
||||
developerConnection = 'scm:git:git://github.com/SpringSource/spring-framework'
|
||||
url = "https://github.com/SpringSource/spring-framework"
|
||||
connection = "scm:git:git://github.com/SpringSource/spring-framework"
|
||||
developerConnection = "scm:git:git://github.com/SpringSource/spring-framework"
|
||||
}
|
||||
developers {
|
||||
developer {
|
||||
id = 'jhoeller'
|
||||
name = 'Juergen Hoeller'
|
||||
email = 'jhoeller@vmware.com'
|
||||
id = "jhoeller"
|
||||
name = "Juergen Hoeller"
|
||||
email = "jhoeller@vmware.com"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user