after merge

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
senivam · Dec 18, 2024 · 9124188 · 9124188
1 parent 804fada
commit 9124188
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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 -->

diff --git a/test-framework/maven/container-runner-maven-plugin/pom.xml b/test-framework/maven/container-runner-maven-plugin/pom.xml
@@ -36,7 +36,7 @@
     </description>
 
     <properties>
-<!--        <groovy.version>3.0.21</groovy.version>-->
+        <groovy.version>${groovy.jdk8.version}</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>

diff --git 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>