Skip to content

Commit a7bd311

Browse files
committed
Polishing.
Simplify test dependency setup, remove no longer required servlet/xbean dependencies, exclude commons-lang3 in favor of the Testcontainers variant. Remove outdated commons-codec dependency in favor of the Testcontainers variant. See #3212
1 parent 003d75f commit a7bd311

File tree

1 file changed

+21
-30
lines changed

1 file changed

+21
-30
lines changed

pom.xml

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,27 @@
9191
<url>https://github.com/spring-projects/spring-data-elasticsearch/issues</url>
9292
</issueManagement>
9393

94+
95+
<dependencyManagement>
96+
<dependencies>
97+
98+
<dependency>
99+
<groupId>org.apache.commons</groupId>
100+
<artifactId>commons-lang3</artifactId>
101+
<version>3.19.0</version>
102+
<scope>test</scope>
103+
</dependency>
104+
105+
<dependency>
106+
<groupId>commons-io</groupId>
107+
<artifactId>commons-io</artifactId>
108+
<version>2.20.0</version>
109+
<scope>test</scope>
110+
</dependency>
111+
112+
</dependencies>
113+
</dependencyManagement>
114+
94115
<dependencies>
95116

96117
<!-- Spring -->
@@ -301,49 +322,19 @@
301322
<scope>test</scope>
302323
</dependency>
303324

304-
<!-- Upgrade xbean to 4.5 to prevent incompatibilities due to ASM versions -->
305-
<dependency>
306-
<groupId>org.apache.xbean</groupId>
307-
<artifactId>xbean-asm5-shaded</artifactId>
308-
<version>4.5</version>
309-
<scope>test</scope>
310-
</dependency>
311-
312-
<dependency>
313-
<groupId>javax.servlet</groupId>
314-
<artifactId>javax.servlet-api</artifactId>
315-
<version>3.1.0</version>
316-
<scope>test</scope>
317-
</dependency>
318-
319325
<dependency>
320326
<groupId>org.mockito</groupId>
321327
<artifactId>mockito-junit-jupiter</artifactId>
322328
<version>${mockito}</version>
323329
<scope>test</scope>
324330
</dependency>
325331

326-
<dependency>
327-
<groupId>org.apache.commons</groupId>
328-
<artifactId>commons-lang3</artifactId>
329-
<version>3.19.0</version>
330-
<scope>test</scope>
331-
</dependency>
332-
333332
<dependency>
334333
<groupId>org.testcontainers</groupId>
335334
<artifactId>testcontainers-elasticsearch</artifactId>
336335
<scope>test</scope>
337336
</dependency>
338337

339-
<!--we need Murmur3Hash in a test, before 5.2 we had it from the old Elasticsearch dependency -->
340-
<dependency>
341-
<groupId>commons-codec</groupId>
342-
<artifactId>commons-codec</artifactId>
343-
<version>1.15</version>
344-
<scope>test</scope>
345-
</dependency>
346-
347338
<dependency>
348339
<groupId>com.tngtech.archunit</groupId>
349340
<artifactId>archunit-junit5</artifactId>

0 commit comments

Comments
 (0)