|
|
|
|
@ -20,20 +20,20 @@ plugins {
@@ -20,20 +20,20 @@ plugins {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
buildScan { |
|
|
|
|
licenseAgreementUrl = 'https://gradle.com/terms-of-service' |
|
|
|
|
licenseAgree = 'yes' |
|
|
|
|
licenseAgreementUrl = "https://gradle.com/terms-of-service" |
|
|
|
|
licenseAgree = "yes" |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ext { |
|
|
|
|
linkHomepage = 'https://projects.spring.io/spring-framework' |
|
|
|
|
linkCi = 'https://build.spring.io/browse/SPR' |
|
|
|
|
linkIssue = 'https://jira.spring.io/browse/SPR' |
|
|
|
|
linkScmUrl = 'https://github.com/spring-projects/spring-framework' |
|
|
|
|
linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-framework.git' |
|
|
|
|
linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-framework.git' |
|
|
|
|
linkHomepage = "https://projects.spring.io/spring-framework" |
|
|
|
|
linkCi = "https://build.spring.io/browse/SPR" |
|
|
|
|
linkIssue = "https://jira.spring.io/browse/SPR" |
|
|
|
|
linkScmUrl = "https://github.com/spring-projects/spring-framework" |
|
|
|
|
linkScmConnection = "scm:git:git://github.com/spring-projects/spring-framework.git" |
|
|
|
|
linkScmDevConnection = "scm:git:ssh://git@github.com:spring-projects/spring-framework.git" |
|
|
|
|
|
|
|
|
|
moduleProjects = subprojects.findAll { |
|
|
|
|
!it.name.equals('spring-build-src') && !it.name.equals('spring-framework-bom') |
|
|
|
|
!it.name.equals("spring-build-src") && !it.name.equals("spring-framework-bom") |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
aspectjVersion = "1.8.13" |
|
|
|
|
@ -67,15 +67,16 @@ configure(allprojects) { project ->
@@ -67,15 +67,16 @@ configure(allprojects) { project ->
|
|
|
|
|
group = "org.springframework" |
|
|
|
|
version = qualifyVersionIfNecessary(version) |
|
|
|
|
|
|
|
|
|
apply plugin: "propdeps" |
|
|
|
|
apply plugin: "java" |
|
|
|
|
apply plugin: "kotlin" |
|
|
|
|
apply plugin: "propdeps" |
|
|
|
|
apply plugin: "test-source-set-dependencies" |
|
|
|
|
apply plugin: "io.spring.dependency-management" |
|
|
|
|
apply from: "${gradleScriptDir}/ide.gradle" |
|
|
|
|
|
|
|
|
|
dependencyManagement { |
|
|
|
|
resolutionStrategy { |
|
|
|
|
cacheChangingModulesFor 0, 'seconds' |
|
|
|
|
cacheChangingModulesFor 0, "seconds" |
|
|
|
|
} |
|
|
|
|
applyMavenExclusions = false |
|
|
|
|
generatedPomCustomization { |
|
|
|
|
@ -83,33 +84,16 @@ configure(allprojects) { project ->
@@ -83,33 +84,16 @@ configure(allprojects) { project ->
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
apply plugin: "kotlin" |
|
|
|
|
compileKotlin { |
|
|
|
|
kotlinOptions { |
|
|
|
|
jvmTarget = "1.8" |
|
|
|
|
freeCompilerArgs = ["-Xjsr305=strict"] |
|
|
|
|
apiVersion = "1.1" |
|
|
|
|
languageVersion = "1.1" |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
compileTestKotlin { |
|
|
|
|
kotlinOptions { |
|
|
|
|
jvmTarget = "1.8" |
|
|
|
|
freeCompilerArgs = ["-Xjsr305=strict"] |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
configurations.all { |
|
|
|
|
// Check for updates every build |
|
|
|
|
resolutionStrategy.cacheChangingModulesFor 0, 'seconds' |
|
|
|
|
resolutionStrategy.cacheChangingModulesFor 0, "seconds" |
|
|
|
|
|
|
|
|
|
// Consistent slf4j version (e.g. clashes between slf4j versions) |
|
|
|
|
resolutionStrategy.eachDependency { DependencyResolveDetails details -> |
|
|
|
|
if (details.requested.group == 'org.slf4j') { |
|
|
|
|
if (details.requested.group == "org.slf4j") { |
|
|
|
|
details.useVersion slf4jVersion |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
def commonCompilerArgs = |
|
|
|
|
@ -122,22 +106,38 @@ configure(allprojects) { project ->
@@ -122,22 +106,38 @@ configure(allprojects) { project ->
|
|
|
|
|
"-Xlint:deprecation", "-Xlint:unchecked", "-Werror"] |
|
|
|
|
|
|
|
|
|
compileTestJava.options*.compilerArgs = commonCompilerArgs + |
|
|
|
|
["-Xlint:-varargs", "-Xlint:-fallthrough","-Xlint:-rawtypes", |
|
|
|
|
["-Xlint:-varargs", "-Xlint:-fallthrough", "-Xlint:-rawtypes", |
|
|
|
|
"-Xlint:-deprecation", "-Xlint:-unchecked"] |
|
|
|
|
|
|
|
|
|
compileJava { |
|
|
|
|
sourceCompatibility = 1.8 // can be switched to 10 for testing |
|
|
|
|
targetCompatibility = 1.8 |
|
|
|
|
options.encoding = 'UTF-8' |
|
|
|
|
options.encoding = "UTF-8" |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
compileTestJava { |
|
|
|
|
sourceCompatibility = 1.8 // can be switched to 10 for testing |
|
|
|
|
targetCompatibility = 1.8 |
|
|
|
|
options.encoding = 'UTF-8' |
|
|
|
|
options.encoding = "UTF-8" |
|
|
|
|
options.compilerArgs += "-parameters" |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
compileKotlin { |
|
|
|
|
kotlinOptions { |
|
|
|
|
jvmTarget = "1.8" |
|
|
|
|
freeCompilerArgs = ["-Xjsr305=strict"] |
|
|
|
|
apiVersion = "1.1" |
|
|
|
|
languageVersion = "1.1" |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
compileTestKotlin { |
|
|
|
|
kotlinOptions { |
|
|
|
|
jvmTarget = "1.8" |
|
|
|
|
freeCompilerArgs = ["-Xjsr305=strict"] |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
test { |
|
|
|
|
systemProperty("java.awt.headless", "true") |
|
|
|
|
systemProperty("testGroups", project.properties.get("testGroups")) |
|
|
|
|
@ -156,15 +156,15 @@ configure(allprojects) { project ->
@@ -156,15 +156,15 @@ configure(allprojects) { project ->
|
|
|
|
|
|
|
|
|
|
dependencies { |
|
|
|
|
testCompile("junit:junit:4.12") { |
|
|
|
|
exclude group:'org.hamcrest', module:'hamcrest-core' |
|
|
|
|
exclude group: "org.hamcrest", module: "hamcrest-core" |
|
|
|
|
} |
|
|
|
|
testCompile("org.mockito:mockito-core:2.19.1") { |
|
|
|
|
exclude group:'org.hamcrest', module:'hamcrest-core' |
|
|
|
|
exclude group: "org.hamcrest", module: "hamcrest-core" |
|
|
|
|
} |
|
|
|
|
testCompile("com.nhaarman:mockito-kotlin:1.6.0") { |
|
|
|
|
exclude module:'kotlin-stdlib' |
|
|
|
|
exclude module:'kotlin-reflect' |
|
|
|
|
exclude module:'mockito-core' |
|
|
|
|
exclude module: "kotlin-stdlib" |
|
|
|
|
exclude module: "kotlin-reflect" |
|
|
|
|
exclude module: "mockito-core" |
|
|
|
|
} |
|
|
|
|
testCompile("org.hamcrest:hamcrest-all:1.3") |
|
|
|
|
testRuntime("org.apache.logging.log4j:log4j-core:${log4jVersion}") |
|
|
|
|
@ -221,7 +221,7 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
@@ -221,7 +221,7 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
|
|
|
|
|
options.header = project.name |
|
|
|
|
options.use = true |
|
|
|
|
options.links(project.ext.javadocLinks) |
|
|
|
|
options.addStringOption('Xdoclint:none', '-quiet') |
|
|
|
|
options.addStringOption("Xdoclint:none", "-quiet") |
|
|
|
|
|
|
|
|
|
// Suppress warnings due to cross-module @see and @link references. |
|
|
|
|
// Note that global 'api' task does display all warnings. |
|
|
|
|
@ -231,7 +231,7 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
@@ -231,7 +231,7 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
|
|
|
|
|
|
|
|
|
|
task sourcesJar(type: Jar, dependsOn: classes) { |
|
|
|
|
duplicatesStrategy = DuplicatesStrategy.EXCLUDE |
|
|
|
|
classifier = 'sources' |
|
|
|
|
classifier = "sources" |
|
|
|
|
from sourceSets.main.allSource |
|
|
|
|
// Don't include or exclude anything explicitly by default. See SPR-12085. |
|
|
|
|
} |
|
|
|
|
@ -260,7 +260,7 @@ configure(rootProject) {
@@ -260,7 +260,7 @@ configure(rootProject) {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// don't publish the default jar for the root project |
|
|
|
|
// Don't publish the default jar for the root project |
|
|
|
|
configurations.archives.artifacts.clear() |
|
|
|
|
|
|
|
|
|
dependencies { // for integration tests |
|
|
|
|
@ -290,7 +290,7 @@ configure(rootProject) {
@@ -290,7 +290,7 @@ configure(rootProject) {
|
|
|
|
|
|
|
|
|
|
task wrapper(type: Wrapper) { |
|
|
|
|
description = "Generates gradlew[.bat] scripts" |
|
|
|
|
gradleVersion = '4.4.1' |
|
|
|
|
gradleVersion = "4.4.1" |
|
|
|
|
|
|
|
|
|
doLast() { |
|
|
|
|
def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m" |
|
|
|
|
@ -303,7 +303,6 @@ configure(rootProject) {
@@ -303,7 +303,6 @@ configure(rootProject) {
|
|
|
|
|
"set GRADLE_OPTS=$gradleBatOpts %GRADLE_OPTS%\nset DEFAULT_JVM_OPTS=") |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* |
|
|
|
|
@ -317,7 +316,7 @@ def qualifyVersionIfNecessary(version) {
@@ -317,7 +316,7 @@ def qualifyVersionIfNecessary(version) {
|
|
|
|
|
if (rootProject.hasProperty("BRANCH_NAME")) { |
|
|
|
|
def qualifier = rootProject.getProperty("BRANCH_NAME") |
|
|
|
|
if (qualifier.startsWith("SPR-")) { |
|
|
|
|
return version.replace('BUILD', qualifier) |
|
|
|
|
return version.replace("BUILD", qualifier) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return version |
|
|
|
|
|