From 1249cd4126f2d52eb461f5464b59843a2dfc1ec9 Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Wed, 18 Dec 2024 06:59:40 +0100
Subject: [PATCH] after merge

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 examples/groovy/pom.xml                                |  8 ++++++++
 pom.xml                                                |  3 ++-
 .../maven/container-runner-maven-plugin/pom.xml        | 10 +++++++++-
 tests/e2e-inject/non-inject/pom.xml                    |  2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml
index 0ee145f0c9..a12fae22b2 100644
--- a/examples/groovy/pom.xml
+++ b/examples/groovy/pom.xml
@@ -42,6 +42,14 @@
                     <groupId>org.junit.jupiter</groupId>
                     <artifactId>junit-jupiter-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-engine</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.junit.platform</groupId>
+                    <artifactId>junit-platform-commons</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.ow2.asm</groupId>
                     <artifactId>asm</artifactId>
diff --git a/pom.xml b/pom.xml
index 297dae22c7..bc1397ead7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2197,6 +2197,7 @@
         <freemarker.version>2.3.33</freemarker.version>
         <gae.version>2.0.29</gae.version>
         <groovy.version>5.0.0-alpha-11</groovy.version>
+        <groovy.jdk8.version>4.0.24</groovy.jdk8.version>
         <gson.version>2.11.0</gson.version>
 
         <!--versions, extracted here due to maven-enforcer-plugin -->
@@ -2236,7 +2237,7 @@
         <jmh.version>1.37</jmh.version>
         <jmockit.version>1.49</jmockit.version>
         <junit4.version>4.13.2</junit4.version>
-        <junit5.version>5.11.0</junit5.version>
+        <junit5.version>5.11.4</junit5.version>
         <junit5.jdk8.version>5.10.3</junit5.jdk8.version>
         <junit-platform-suite.version>1.11.0</junit-platform-suite.version>
         <kryo.version>4.0.3</kryo.version>
diff --git a/test-framework/maven/container-runner-maven-plugin/pom.xml b/test-framework/maven/container-runner-maven-plugin/pom.xml
index f2f9cc05df..ffe867e2a7 100644
--- a/test-framework/maven/container-runner-maven-plugin/pom.xml
+++ b/test-framework/maven/container-runner-maven-plugin/pom.xml
@@ -36,7 +36,6 @@
     </description>
 
     <properties>
-<!--        <groovy.version>3.0.21</groovy.version>-->
         <groovy-eclipse-compiler.version>3.7.0</groovy-eclipse-compiler.version>
         <groovy-eclipse-batch.version>3.0.8-01</groovy-eclipse-batch.version>
         <maven.version>3.9.2</maven.version>
@@ -305,5 +304,14 @@
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>jdk_8</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <properties>
+                <groovy.version>${groovy.jdk8.version}</groovy.version>
+            </properties>
+        </profile>
     </profiles>
 </project>
diff --git a/tests/e2e-inject/non-inject/pom.xml b/tests/e2e-inject/non-inject/pom.xml
index 39a348ecd3..f1f1082233 100644
--- a/tests/e2e-inject/non-inject/pom.xml
+++ b/tests/e2e-inject/non-inject/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.glassfish.jersey.incubator</groupId>
             <artifactId>jersey-injectless-client</artifactId>
-            <version>2.46-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>