Skip to content

Commit f16b653

Browse files
committed
after merge
Signed-off-by: Maxim Nesen <[email protected]>
1 parent 6d2b142 commit f16b653

File tree

4 files changed

+50
-3
lines changed

4 files changed

+50
-3
lines changed

examples/groovy/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@
4242
<groupId>org.junit.jupiter</groupId>
4343
<artifactId>junit-jupiter-api</artifactId>
4444
</exclusion>
45+
<exclusion>
46+
<groupId>org.junit.jupiter</groupId>
47+
<artifactId>junit-jupiter-engine</artifactId>
48+
</exclusion>
49+
<exclusion>
50+
<groupId>org.junit.platform</groupId>
51+
<artifactId>junit-platform-commons</artifactId>
52+
</exclusion>
4553
<exclusion>
4654
<groupId>org.ow2.asm</groupId>
4755
<artifactId>asm</artifactId>

pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2197,6 +2197,7 @@
21972197
<freemarker.version>2.3.33</freemarker.version>
21982198
<gae.version>2.0.29</gae.version>
21992199
<groovy.version>5.0.0-alpha-11</groovy.version>
2200+
<groovy.jdk8.version>4.0.24</groovy.jdk8.version>
22002201
<gson.version>2.11.0</gson.version>
22012202

22022203
<!--versions, extracted here due to maven-enforcer-plugin -->
@@ -2236,7 +2237,7 @@
22362237
<jmh.version>1.37</jmh.version>
22372238
<jmockit.version>1.49</jmockit.version>
22382239
<junit4.version>4.13.2</junit4.version>
2239-
<junit5.version>5.11.0</junit5.version>
2240+
<junit5.version>5.11.4</junit5.version>
22402241
<junit5.jdk8.version>5.10.3</junit5.jdk8.version>
22412242
<junit-platform-suite.version>1.11.0</junit-platform-suite.version>
22422243
<kryo.version>4.0.3</kryo.version>

test-framework/maven/container-runner-maven-plugin/pom.xml

+39-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
</description>
3737

3838
<properties>
39-
<!-- <groovy.version>3.0.21</groovy.version>-->
4039
<groovy-eclipse-compiler.version>3.7.0</groovy-eclipse-compiler.version>
4140
<groovy-eclipse-batch.version>3.0.8-01</groovy-eclipse-batch.version>
4241
<maven.version>3.9.2</maven.version>
@@ -305,5 +304,44 @@
305304
</pluginManagement>
306305
</build>
307306
</profile>
307+
<profile>
308+
<id>jdk_8</id>
309+
<activation>
310+
<jdk>1.8</jdk>
311+
</activation>
312+
<properties>
313+
<groovy.version>${groovy.jdk8.version}</groovy.version>
314+
</properties>
315+
<dependencies>
316+
<dependency>
317+
<groupId>org.apache.groovy</groupId>
318+
<artifactId>groovy-all</artifactId>
319+
<type>pom</type>
320+
<version>${groovy.version}</version>
321+
<exclusions>
322+
<exclusion>
323+
<groupId>com.fasterxml.jackson.core</groupId>
324+
<artifactId>jackson-core</artifactId>
325+
</exclusion>
326+
<exclusion>
327+
<groupId>com.fasterxml.jackson.core</groupId>
328+
<artifactId>jackson-databind</artifactId>
329+
</exclusion>
330+
<exclusion>
331+
<groupId>org.junit.jupiter</groupId>
332+
<artifactId>junit-jupiter-api</artifactId>
333+
</exclusion>
334+
<exclusion>
335+
<groupId>org.junit.jupiter</groupId>
336+
<artifactId>junit-jupiter-engine</artifactId>
337+
</exclusion>
338+
<exclusion>
339+
<groupId>org.junit.platform</groupId>
340+
<artifactId>junit-platform-commons</artifactId>
341+
</exclusion>
342+
</exclusions>
343+
</dependency>
344+
</dependencies>
345+
</profile>
308346
</profiles>
309347
</project>

tests/e2e-inject/non-inject/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>org.glassfish.jersey.incubator</groupId>
3535
<artifactId>jersey-injectless-client</artifactId>
36-
<version>2.46-SNAPSHOT</version>
36+
<version>${project.version}</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.glassfish.jersey.core</groupId>

0 commit comments

Comments
 (0)