Skip to content

Commit 424a59d

Browse files
Arrange assertion (#264)
* Arrange assertion * generated dependencies in pom have changed Before (assert 2): ``` <dependencies> <dependency> <groupId>io.pivotal.cfenv</groupId> <artifactId>java-cfenv</artifactId> <version>3.1.6-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.pivotal.cfenv</groupId> <artifactId>java-cfenv</artifactId> <version>3.1.6-SNAPSHOT</version> <scope>compile</scope> <type>test-jar</type> </dependency> [...] </dependencies> ``` after (assert 1): ``` <dependencies> <dependency> <groupId>io.pivotal.cfenv</groupId> <artifactId>java-cfenv</artifactId> <version>3.1.6-SNAPSHOT</version> <scope>compile</scope> <type>test-jar</type> </dependency> </dependencies> ``` It's as if Gradle "optimized" the 2 deps into 1 - for most probably (I'm gonna find out) the same classpath result in Maven * Keep previous assertion and generated pom too!
1 parent f85c603 commit 424a59d

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,13 @@ publishing {
161161

162162
if (project.name == 'java-cfenv-test-support') {
163163
def cfenvDependencies = pomNode.get('dependencies')[0].findAll { it.get('artifactId')[0].text() == 'java-cfenv' }
164+
assert cfenvDependencies.size() == 1
165+
def clone = cfenvDependencies[0].clone()
166+
// see https://github.com/pivotal-cf/java-cfenv/pull/264#issuecomment-2105127180
167+
cfenvDependencies[0].appendNode('type', "test-jar")
168+
pomNode.get('dependencies')[0].children().add(0, clone)
169+
cfenvDependencies = pomNode.get('dependencies')[0].findAll { it.get('artifactId')[0].text() == 'java-cfenv' }
164170
assert cfenvDependencies.size() == 2
165-
cfenvDependencies[1].appendNode('type', "test-jar")
166171
}
167172
}
168173
}

0 commit comments

Comments
 (0)