Skip to content

Commit 056001c

Browse files
committed
HV-2008 Bump the AssertJ version to the latest 3.26.3
and override the version in TCK runner to match the one in Jakarta Validation
1 parent 560d24f commit 056001c

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ updates:
6060
- dependency-name: "jakarta.inject:jakarta.inject-api"
6161
- dependency-name: "jakarta.persistence:jakarta.persistence-api"
6262
- dependency-name: "jakarta.ws.rs:jakarta.ws.rs-api"
63-
# Bean Validation TCK requires a particular version of AssertJ and using others leads to errors:
63+
# We are managing the version of AssertJ manually:
64+
# - tck-runner requires a specific version of AssertJ aligned with the Jakarta Validation TCK
65+
# - all other modules are using a more recent version (latest)
66+
# we cannot enable the automatic updates as those will constantly push us to change the version in the TCK module
6467
- dependency-name: "org.assertj:*"
6568
# We have a fixed major version of OpenJFX to work with the min JDK we require
6669
- dependency-name: "org.openjfx:*"

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@
181181
<version.shrinkwrap.resolvers>3.3.0</version.shrinkwrap.resolvers>
182182
<version.shrinkwrap.descriptors>2.0.0</version.shrinkwrap.descriptors>
183183
<version.org.testng>7.10.2</version.org.testng>
184-
<!-- it must be the exact same version than the one used in the Bean Validation TCK -->
185-
<version.org.assertj.assertj-core>3.8.0</version.org.assertj.assertj-core>
184+
<version.org.assertj.assertj-core>3.26.3</version.org.assertj.assertj-core>
186185
<version.junit>4.13.2</version.junit>
187186
<version.org.easymock>5.3.0</version.org.easymock>
188187
<version.io.rest-assured>5.5.0</version.io.rest-assured>

tck-runner/pom.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,30 @@
2121
<description>Aggregates dependencies and runs the Jakarta Validation TCK</description>
2222

2323
<properties>
24+
<!--
25+
We are overriding the AssertJ version here and adding a dependency management for it
26+
to override the one we are using for the main build.
27+
The version here must be the exact same version as the one used in the Bean Validation TCK
28+
-->
29+
<version.org.assertj.assertj-core>3.8.0</version.org.assertj.assertj-core>
30+
2431
<tck.suite.file>${project.build.directory}/dependency/validation-tck-tests-suite.xml</tck.suite.file>
2532
<validation.provider>org.hibernate.validator.HibernateValidator</validation.provider>
2633
<remote.debug />
2734

2835
<hibernate-validator-parent.path>..</hibernate-validator-parent.path>
2936
</properties>
3037

38+
<dependencyManagement>
39+
<dependencies>
40+
<dependency>
41+
<groupId>org.assertj</groupId>
42+
<artifactId>assertj-core</artifactId>
43+
<version>${version.org.assertj.assertj-core}</version>
44+
</dependency>
45+
</dependencies>
46+
</dependencyManagement>
47+
3148
<dependencies>
3249
<dependency>
3350
<groupId>jakarta.validation</groupId>

0 commit comments

Comments
 (0)