From 7829fdf3324973a0c32bdf0b2687fca77727484b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 18:59:17 +0000
Subject: [PATCH 1/2] Bump org.apache.groovy:groovy-all from 4.0.4 to 4.0.15

Bumps [org.apache.groovy:groovy-all](https://github.com/apache/groovy) from 4.0.4 to 4.0.15.
- [Commits](https://github.com/apache/groovy/commits)

---
updated-dependencies:
- dependency-name: org.apache.groovy:groovy-all
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c8efc09b7798..726e2318ad2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,7 +319,7 @@
         <version.com.beust>1.78</version.com.beust>
         <version.com.github.tomakehurst.wiremock>2.27.2</version.com.github.tomakehurst.wiremock>
         <version.dom4j>2.1.3</version.dom4j>
-        <version.groovy-all>4.0.4</version.groovy-all>
+        <version.groovy-all>4.0.15</version.groovy-all>
         <version.httpunit>1.7.2</version.httpunit>
         <legacy.version.io.netty>4.0.13.Final</legacy.version.io.netty>
         <version.io.rest-assured>3.0.6</version.io.rest-assured>

From 46b4b484c5f08c1cb9be9392bb274593f64b65a2 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@redhat.com>
Date: Thu, 26 Oct 2023 17:30:50 -0500
Subject: [PATCH 2/2] [WFLY-18697] Switch ejb subsystem test dep from
 groovy-all to groovy

---
 boms/standard-test/pom.xml | 11 ++++++++---
 ejb3/pom.xml               |  9 +--------
 pom.xml                    |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/boms/standard-test/pom.xml b/boms/standard-test/pom.xml
index dca434c20883..632a6d3d630c 100644
--- a/boms/standard-test/pom.xml
+++ b/boms/standard-test/pom.xml
@@ -81,10 +81,15 @@
 
             <dependency>
                 <groupId>org.apache.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>${version.groovy-all}</version>
-                <type>pom</type>
+                <artifactId>groovy</artifactId>
+                <version>${version.org.apache.groovy}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
diff --git a/ejb3/pom.xml b/ejb3/pom.xml
index ead6a16a313c..f9e5a4477e5c 100644
--- a/ejb3/pom.xml
+++ b/ejb3/pom.xml
@@ -410,15 +410,8 @@ projects that depend on this project.-->
 
         <dependency>
             <groupId>org.apache.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <type>pom</type>
+            <artifactId>groovy</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.groovy</groupId>
-                    <artifactId>groovy-test-junit5</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 726e2318ad2d..5f0e1437e752 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,7 +319,6 @@
         <version.com.beust>1.78</version.com.beust>
         <version.com.github.tomakehurst.wiremock>2.27.2</version.com.github.tomakehurst.wiremock>
         <version.dom4j>2.1.3</version.dom4j>
-        <version.groovy-all>4.0.15</version.groovy-all>
         <version.httpunit>1.7.2</version.httpunit>
         <legacy.version.io.netty>4.0.13.Final</legacy.version.io.netty>
         <version.io.rest-assured>3.0.6</version.io.rest-assured>
@@ -329,6 +328,7 @@
         <version.jsoup>1.15.3</version.jsoup>
         <version.junit>4.13.1</version.junit>
         <version.org.apache.ds>2.0.0.AM26</version.org.apache.ds>
+        <version.org.apache.groovy>4.0.15</version.org.apache.groovy>
         <version.org.awaitility.awaitility>4.0.2</version.org.awaitility.awaitility>
         <version.org.codehaus.plexus.plexus-utils>3.5.0</version.org.codehaus.plexus.plexus-utils>
         <version.org.eclipse.jetty>9.4.52.v20230823</version.org.eclipse.jetty>