Skip to content

Commit a7febdd

Browse files
committed
DATAGRAPH-1404 - Streamline POM dependencies setup.
Use inherited dependency declarations where possible. Import testcontainers-bom.
1 parent 3ed1ca1 commit a7febdd

File tree

1 file changed

+11
-73
lines changed

1 file changed

+11
-73
lines changed

pom.xml

Lines changed: 11 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@
7373
<asciidoctorj-diagram.version>2.0.1</asciidoctorj-diagram.version>
7474

7575
<!-- 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>
7876
<byte-buddy.version>1.10.9</byte-buddy.version>
7977
<cdi>2.0</cdi>
8078
<changelist>-SNAPSHOT</changelist>
@@ -92,7 +90,6 @@
9290
<jqassistant.plugin.version>1.8.0</jqassistant.plugin.version>
9391
<jqassistant.version>1.8.0</jqassistant.version>
9492
<junit-cc-testcontainer>4.0.2.2</junit-cc-testcontainer>
95-
<junit-jupiter.version>5.6.1</junit-jupiter.version>
9693
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
9794
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
9895
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
@@ -123,7 +120,6 @@
123120

124121
<skipUnitTests>${skipTests}</skipUnitTests>
125122
<springdata.commons>2.4.0-SNAPSHOT</springdata.commons>
126-
<testcontainers.version>1.13.0</testcontainers.version>
127123

128124
<spring-data-commons-docs.dir>../../../../../spring-data-commons/src/main/asciidoc</spring-data-commons-docs.dir>
129125
</properties>
@@ -179,31 +175,6 @@
179175
<artifactId>apiguardian-api</artifactId>
180176
<version>${apiguardian.version}</version>
181177
</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>
207178
<dependency>
208179
<groupId>org.neo4j</groupId>
209180
<artifactId>neo4j</artifactId>
@@ -241,21 +212,10 @@
241212
</dependency>
242213
<dependency>
243214
<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>
259219
</dependency>
260220
</dependencies>
261221
</dependencyManagement>
@@ -325,11 +285,6 @@
325285
<groupId>org.apiguardian</groupId>
326286
<artifactId>apiguardian-api</artifactId>
327287
</dependency>
328-
<dependency>
329-
<groupId>org.assertj</groupId>
330-
<artifactId>assertj-core</artifactId>
331-
<scope>test</scope>
332-
</dependency>
333288
<dependency>
334289
<groupId>org.jboss.weld.se</groupId>
335290
<artifactId>weld-se-core</artifactId>
@@ -356,21 +311,6 @@
356311
<artifactId>kotlinx-coroutines-reactor</artifactId>
357312
<optional>true</optional>
358313
</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>
374314
<dependency>
375315
<groupId>org.neo4j</groupId>
376316
<artifactId>neo4j-cypher-dsl</artifactId>
@@ -379,14 +319,6 @@
379319
<groupId>org.neo4j.driver</groupId>
380320
<artifactId>neo4j-java-driver</artifactId>
381321
</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>
390322
<dependency>
391323
<groupId>org.springframework</groupId>
392324
<artifactId>spring-beans</artifactId>
@@ -410,13 +342,19 @@
410342
<dependency>
411343
<groupId>org.springframework.data</groupId>
412344
<artifactId>spring-data-r2dbc</artifactId>
413-
<version>1.0.0.RELEASE</version>
345+
<version>1.1.0.RELEASE</version>
414346
<scope>test</scope>
415347
</dependency>
416348
<dependency>
417349
<groupId>org.testcontainers</groupId>
418350
<artifactId>junit-jupiter</artifactId>
419351
<scope>test</scope>
352+
<exclusions>
353+
<exclusion>
354+
<artifactId>annotations</artifactId>
355+
<groupId>org.jetbrains</groupId>
356+
</exclusion>
357+
</exclusions>
420358
</dependency>
421359
<dependency>
422360
<groupId>org.testcontainers</groupId>

0 commit comments

Comments
 (0)