Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace VersionsResourceTasks with WriteProperties

Browse Source 
VersionsResourceTasks wrote a date comment which prevented this from
producing the same result and caused misses in the cache.

Closes gh-8114
This commit is contained in:
Rob Winch
2020-03-04 15:14:21 -06:00
parent 034c6c078f
commit 7ad303f0ce
2 changed files with 9 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-security-core.gradle
+9 -7
View File
@@ -1,3 +1,5 @@
import java.util.concurrent.Callable
apply plugin: 'io.spring.convention.spring-module'
def includeProject = project(':spring-security-crypto')
@@ -34,9 +36,9 @@ dependencies {
testRuntime 'org.hsqldb:hsqldb'
}
task springVersion(type: versions.VersionsResourceTasks) {
versionsFile = file("${buildDir}/versions/spring-security.versions")
versions = provider { ["org.springframework:spring-core":"${springVersion()}"] }
task springVersion(type: org.gradle.api.tasks.WriteProperties) {
outputFile = file("${buildDir}/versions/spring-security.versions")
property("org.springframework:spring-core", springVersion())
}
tasks.processResources {
@@ -52,11 +54,11 @@ tasks.sourcesJar.from {includeProject.sourceSets.main.java}
configure(project.tasks.withType(Test)) {
doFirst {
systemProperties['springSecurityVersion'] = version
systemProperties['springVersion'] = springVersion()
systemProperties['springVersion'] = springVersion().call()
}
}
String springVersion() {
return project.configurations.compile.resolvedConfiguration.resolvedArtifacts
.find { it.name == 'spring-core' }.moduleVersion.id.version
Callable<String> springVersion() {
return (Callable<String>) { project.configurations.compile.resolvedConfiguration.resolvedArtifacts
.find { it.name == 'spring-core' }.moduleVersion.id.version }
}