Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions dd-java-agent/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,18 @@ def generateAgentJarIndex = tasks.register('generateAgentJarIndex', JavaExec) {
}
sourceSets.main.resources.srcDir(generateAgentJarIndex)

def generatePomProperties = tasks.register('generatePomProperties', WriteProperties) {
destinationFile = project.layout.buildDirectory.file("generated/maven-metadata/META-INF/maven/com.datadoghq/dd-java-agent/pom.properties")
property("groupId", "com.datadoghq")
property("artifactId", "dd-java-agent")
property("version", project.providers.provider { project.version.toString() })
}
sourceSets.main.resources.srcDir(
generatePomProperties.map {
project.layout.buildDirectory.dir("generated/maven-metadata").get()
}
)

subprojects { Project subProj ->
// Don't need javadoc task run for internal projects.
subProj.tasks.withType(Javadoc).configureEach { enabled = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ abstract class AbstractServerSmokeTest extends AbstractSmokeTest {

and: 'received tracer dependencies'
// Not exhaustive list of tracer dependencies.
Set<String> missingDependencyNames = ['com.github.jnr:jnr-ffi', 'net.bytebuddy:byte-buddy-agent',].toSet()
Set<String> missingDependencyNames = ['com.datadoghq:dd-java-agent', 'com.github.jnr:jnr-ffi', 'net.bytebuddy:byte-buddy-agent',].toSet()
missingDependencyNames.removeAll(dependencyNames) || true
missingDependencyNames.isEmpty()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,26 @@ class DependencyResolverSpecification extends DepSpecification {
)
}

void 'jar with dd-java-agent pom.properties resolves to com.datadoghq:dd-java-agent'() {
given: 'a jar containing META-INF/maven/com.datadoghq/dd-java-agent/pom.properties'
File file = new File(testDir, 'dd-java-agent.jar')
new ZipOutputStream(new FileOutputStream(file)).with {
putNextEntry(new ZipEntry('META-INF/maven/com.datadoghq/dd-java-agent/pom.properties'))
write('groupId=com.datadoghq\nartifactId=dd-java-agent\nversion=1.0.0\n'.getBytes('UTF-8'))
closeEntry()
close()
}

when:
List<Dependency> deps = DependencyResolver.resolve(file.toURI())

then:
deps.size() == 1
deps[0].name == 'com.datadoghq:dd-java-agent'
deps[0].version == '1.0.0'
deps[0].hash == null
}

void 'jar without manifest and no version in filename gets resolved'() {
// If no manifest info and no suitable file name - calculate sha1 hash
knownJarCheck(
Expand Down
Loading