|
73 | 73 | <asciidoctorj-diagram.version>2.0.1</asciidoctorj-diagram.version>
|
74 | 74 |
|
75 | 75 | <!-- For whatever reason, redeclaring those dependencies in our managed dependencies doesn't have any affect... -->
|
76 |
| - <assertj>${assertj.version}</assertj> |
77 |
| - <assertj.version>3.15.0</assertj.version> |
78 | 76 | <byte-buddy.version>1.10.9</byte-buddy.version>
|
79 | 77 | <cdi>2.0</cdi>
|
80 | 78 | <changelist>-SNAPSHOT</changelist>
|
|
92 | 90 | <jqassistant.plugin.version>1.8.0</jqassistant.plugin.version>
|
93 | 91 | <jqassistant.version>1.8.0</jqassistant.version>
|
94 | 92 | <junit-cc-testcontainer>4.0.2.2</junit-cc-testcontainer>
|
95 |
| - <junit-jupiter.version>5.6.1</junit-jupiter.version> |
96 | 93 | <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
|
97 | 94 | <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
|
98 | 95 | <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
|
|
123 | 120 |
|
124 | 121 | <skipUnitTests>${skipTests}</skipUnitTests>
|
125 | 122 | <springdata.commons>2.4.0-SNAPSHOT</springdata.commons>
|
126 |
| - <testcontainers.version>1.13.0</testcontainers.version> |
127 | 123 |
|
128 | 124 | <spring-data-commons-docs.dir>../../../../../spring-data-commons/src/main/asciidoc</spring-data-commons-docs.dir>
|
129 | 125 | </properties>
|
|
179 | 175 | <artifactId>apiguardian-api</artifactId>
|
180 | 176 | <version>${apiguardian.version}</version>
|
181 | 177 | </dependency>
|
182 |
| - <dependency> |
183 |
| - <groupId>org.assertj</groupId> |
184 |
| - <artifactId>assertj-core</artifactId> |
185 |
| - <version>${assertj.version}</version> |
186 |
| - <scope>test</scope> |
187 |
| - </dependency> |
188 |
| - <dependency> |
189 |
| - <groupId>org.junit</groupId> |
190 |
| - <artifactId>junit-bom</artifactId> |
191 |
| - <version>${junit-jupiter.version}</version> |
192 |
| - <type>pom</type> |
193 |
| - <scope>import</scope> |
194 |
| - </dependency> |
195 |
| - <dependency> |
196 |
| - <groupId>org.mockito</groupId> |
197 |
| - <artifactId>mockito-core</artifactId> |
198 |
| - <version>${mockito.version}</version> |
199 |
| - <scope>test</scope> |
200 |
| - </dependency> |
201 |
| - <dependency> |
202 |
| - <groupId>org.mockito</groupId> |
203 |
| - <artifactId>mockito-junit-jupiter</artifactId> |
204 |
| - <version>${mockito.version}</version> |
205 |
| - <scope>test</scope> |
206 |
| - </dependency> |
207 | 178 | <dependency>
|
208 | 179 | <groupId>org.neo4j</groupId>
|
209 | 180 | <artifactId>neo4j</artifactId>
|
|
241 | 212 | </dependency>
|
242 | 213 | <dependency>
|
243 | 214 | <groupId>org.testcontainers</groupId>
|
244 |
| - <artifactId>junit-jupiter</artifactId> |
245 |
| - <version>${testcontainers.version}</version> |
246 |
| - <scope>test</scope> |
247 |
| - <exclusions> |
248 |
| - <exclusion> |
249 |
| - <artifactId>annotations</artifactId> |
250 |
| - <groupId>org.jetbrains</groupId> |
251 |
| - </exclusion> |
252 |
| - </exclusions> |
253 |
| - </dependency> |
254 |
| - <dependency> |
255 |
| - <groupId>org.testcontainers</groupId> |
256 |
| - <artifactId>neo4j</artifactId> |
257 |
| - <version>${testcontainers.version}</version> |
258 |
| - <scope>test</scope> |
| 215 | + <artifactId>testcontainers-bom</artifactId> |
| 216 | + <version>${testcontainers}</version> |
| 217 | + <type>pom</type> |
| 218 | + <scope>import</scope> |
259 | 219 | </dependency>
|
260 | 220 | </dependencies>
|
261 | 221 | </dependencyManagement>
|
|
325 | 285 | <groupId>org.apiguardian</groupId>
|
326 | 286 | <artifactId>apiguardian-api</artifactId>
|
327 | 287 | </dependency>
|
328 |
| - <dependency> |
329 |
| - <groupId>org.assertj</groupId> |
330 |
| - <artifactId>assertj-core</artifactId> |
331 |
| - <scope>test</scope> |
332 |
| - </dependency> |
333 | 288 | <dependency>
|
334 | 289 | <groupId>org.jboss.weld.se</groupId>
|
335 | 290 | <artifactId>weld-se-core</artifactId>
|
|
356 | 311 | <artifactId>kotlinx-coroutines-reactor</artifactId>
|
357 | 312 | <optional>true</optional>
|
358 | 313 | </dependency>
|
359 |
| - <dependency> |
360 |
| - <groupId>org.junit.jupiter</groupId> |
361 |
| - <artifactId>junit-jupiter</artifactId> |
362 |
| - <scope>test</scope> |
363 |
| - </dependency> |
364 |
| - <dependency> |
365 |
| - <groupId>org.mockito</groupId> |
366 |
| - <artifactId>mockito-core</artifactId> |
367 |
| - <scope>test</scope> |
368 |
| - </dependency> |
369 |
| - <dependency> |
370 |
| - <groupId>org.mockito</groupId> |
371 |
| - <artifactId>mockito-junit-jupiter</artifactId> |
372 |
| - <scope>test</scope> |
373 |
| - </dependency> |
374 | 314 | <dependency>
|
375 | 315 | <groupId>org.neo4j</groupId>
|
376 | 316 | <artifactId>neo4j-cypher-dsl</artifactId>
|
|
379 | 319 | <groupId>org.neo4j.driver</groupId>
|
380 | 320 | <artifactId>neo4j-java-driver</artifactId>
|
381 | 321 | </dependency>
|
382 |
| - <!-- Reduce scope of Lombok to test (it is defined by Spring Data Parent) --> |
383 |
| - <dependency> |
384 |
| - <groupId>org.projectlombok</groupId> |
385 |
| - <artifactId>lombok</artifactId> |
386 |
| - <version>${lombok}</version> |
387 |
| - <scope>test</scope> |
388 |
| - <optional>true</optional> |
389 |
| - </dependency> |
390 | 322 | <dependency>
|
391 | 323 | <groupId>org.springframework</groupId>
|
392 | 324 | <artifactId>spring-beans</artifactId>
|
|
410 | 342 | <dependency>
|
411 | 343 | <groupId>org.springframework.data</groupId>
|
412 | 344 | <artifactId>spring-data-r2dbc</artifactId>
|
413 |
| - <version>1.0.0.RELEASE</version> |
| 345 | + <version>1.1.0.RELEASE</version> |
414 | 346 | <scope>test</scope>
|
415 | 347 | </dependency>
|
416 | 348 | <dependency>
|
417 | 349 | <groupId>org.testcontainers</groupId>
|
418 | 350 | <artifactId>junit-jupiter</artifactId>
|
419 | 351 | <scope>test</scope>
|
| 352 | + <exclusions> |
| 353 | + <exclusion> |
| 354 | + <artifactId>annotations</artifactId> |
| 355 | + <groupId>org.jetbrains</groupId> |
| 356 | + </exclusion> |
| 357 | + </exclusions> |
420 | 358 | </dependency>
|
421 | 359 | <dependency>
|
422 | 360 | <groupId>org.testcontainers</groupId>
|
|
0 commit comments