From 999bb61c08fe500f883dfebbd6ffc763c748f114 Mon Sep 17 00:00:00 2001
From: Anthony Dahanne <anthony.dahanne@gmail.com>
Date: Thu, 9 May 2024 17:07:37 -0400
Subject: [PATCH 1/2] 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
---
 .../src/main/groovy/io.pivotal.cfenv.java-conventions.gradle  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle b/buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle
index f5cdc7bc..443386d8 100644
--- a/buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle
@@ -161,8 +161,8 @@ publishing {
 
                     if (project.name == 'java-cfenv-test-support') {
                         def cfenvDependencies = pomNode.get('dependencies')[0].findAll { it.get('artifactId')[0].text() == 'java-cfenv' }
-                        assert cfenvDependencies.size() == 2
-                        cfenvDependencies[1].appendNode('type', "test-jar")
+                        assert cfenvDependencies.size() == 1
+                        cfenvDependencies[0].appendNode('type', "test-jar")
                     }
                 }
             }

From a788be19480211719fb26128f02b4ea411219c1d Mon Sep 17 00:00:00 2001
From: Anthony Dahanne <anthony.dahanne@gmail.com>
Date: Thu, 1 Aug 2024 17:31:40 -0400
Subject: [PATCH 2/2] Keep previous assertion and generated pom too!

---
 .../src/main/groovy/io.pivotal.cfenv.java-conventions.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle b/buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle
index 443386d8..6c5ab976 100644
--- a/buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/io.pivotal.cfenv.java-conventions.gradle
@@ -162,7 +162,12 @@ publishing {
                     if (project.name == 'java-cfenv-test-support') {
                         def cfenvDependencies = pomNode.get('dependencies')[0].findAll { it.get('artifactId')[0].text() == 'java-cfenv' }
                         assert cfenvDependencies.size() == 1
+                        def clone = cfenvDependencies[0].clone()
+                        // see https://github.com/pivotal-cf/java-cfenv/pull/264#issuecomment-2105127180
                         cfenvDependencies[0].appendNode('type', "test-jar")
+                        pomNode.get('dependencies')[0].children().add(0, clone)
+                        cfenvDependencies = pomNode.get('dependencies')[0].findAll { it.get('artifactId')[0].text() == 'java-cfenv' }
+                        assert cfenvDependencies.size() == 2
                     }
                 }
             }