Skip to content

Commit 2e338dd

Browse files
committed
Apply reviewer suggestions
- Use built-in Gradle WriteProperties task instead of custom doLast action, which handles inputs/outputs/caching natively - Fix Groovy with{} usage in test: apply it on ZipOutputStream (not ZipEntry as incorrectly suggested in the upstream commit)
1 parent 7f594e9 commit 2e338dd

2 files changed

Lines changed: 15 additions & 16 deletions

File tree

dd-java-agent/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,17 +324,17 @@ def generateAgentJarIndex = tasks.register('generateAgentJarIndex', JavaExec) {
324324
}
325325
sourceSets.main.resources.srcDir(generateAgentJarIndex)
326326

327-
def generatePomProperties = tasks.register('generatePomProperties') {
328-
def outputDir = project.layout.buildDirectory.dir("generated/maven-metadata")
329-
inputs.property("version", project.provider { project.version.toString() })
330-
outputs.dir(outputDir)
331-
doLast {
332-
def pomPropsFile = outputDir.get().file("META-INF/maven/com.datadoghq/dd-java-agent/pom.properties").asFile
333-
pomPropsFile.parentFile.mkdirs()
334-
pomPropsFile.text = "groupId=com.datadoghq\nartifactId=dd-java-agent\nversion=${project.version}\n"
335-
}
327+
def pomPropertiesOutputDir = project.layout.buildDirectory.dir("generated/maven-metadata")
328+
def generatePomProperties = tasks.register('generatePomProperties', WriteProperties) {
329+
destinationFile = pomPropertiesOutputDir.map { it.file("META-INF/maven/com.datadoghq/dd-java-agent/pom.properties") }
330+
property("groupId", "com.datadoghq")
331+
property("artifactId", "dd-java-agent")
332+
property("version", project.providers.provider { project.version.toString() })
333+
}
334+
sourceSets.main.resources.srcDir(pomPropertiesOutputDir)
335+
tasks.named("processResources") {
336+
dependsOn(generatePomProperties)
336337
}
337-
sourceSets.main.resources.srcDir(generatePomProperties)
338338

339339
subprojects { Project subProj ->
340340
// Don't need javadoc task run for internal projects.

telemetry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverSpecification.groovy

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,11 @@ class DependencyResolverSpecification extends DepSpecification {
9898
void 'jar with dd-java-agent pom.properties resolves to com.datadoghq:dd-java-agent'() {
9999
given: 'a jar containing META-INF/maven/com.datadoghq/dd-java-agent/pom.properties'
100100
File file = new File(testDir, 'dd-java-agent.jar')
101-
ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file))
102-
ZipEntry e = new ZipEntry('META-INF/maven/com.datadoghq/dd-java-agent/pom.properties').with {
103-
putNextEntry(e)
104-
write('groupId=com.datadoghq\nartifactId=dd-java-agent\nversion=1.0.0\n'.getBytes('UTF-8'))
105-
closeEntry()
106-
close()
101+
new ZipOutputStream(new FileOutputStream(file)).with {
102+
putNextEntry(new ZipEntry('META-INF/maven/com.datadoghq/dd-java-agent/pom.properties'))
103+
write('groupId=com.datadoghq\nartifactId=dd-java-agent\nversion=1.0.0\n'.getBytes('UTF-8'))
104+
closeEntry()
105+
close()
107106
}
108107

109108
when:

0 commit comments

Comments
 (0)