Skip to content

Commit 4363def

Browse files
michael-simonsmichael-simons
committed
Revert "Disable dependency convergence in enforcer plugin."
This reverts commit 564b2b5.
1 parent ff045a3 commit 4363def

File tree

1 file changed

+71
-27
lines changed

1 file changed

+71
-27
lines changed

‎pom.xml

+71-27
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,16 @@
7373
<asciidoctorj-diagram.version>2.1.0</asciidoctorj-diagram.version>
7474

7575
<byte-buddy.version>1.11.0</byte-buddy.version>
76+
<cdi>3.0.1</cdi>
77+
<checkstyle.skip>${skipTests}</checkstyle.skip>
7678
<checkstyle.version>8.40</checkstyle.version>
7779
<cypher-dsl.version>2022.2.0</cypher-dsl.version>
7880
<dist.id>spring-data-neo4j</dist.id>
7981
<dist.key>SDNEO4J</dist.key>
8082
<flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>
8183
<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
84+
<jakarta.interceptor-api.version>2.0.1</jakarta.interceptor-api.version>
85+
<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
8286
<java-module-name>spring.data.neo4j</java-module-name>
8387
<java.version>17</java.version>
8488
<jaxb.version>2.3.1</jaxb.version>
@@ -99,7 +103,7 @@
99103
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
100104
<maven.compiler.release>${java.version}</maven.compiler.release>
101105
<mockito>${mockito.version}</mockito>
102-
<mockito.version>4.0.0</mockito.version>
106+
<mockito.version>4.4.0</mockito.version>
103107
<neo4j-java-driver.version>4.4.5</neo4j-java-driver.version>
104108
<neo4j.version>4.3.6</neo4j.version>
105109
<objenesis.version>3.0.1</objenesis.version>
@@ -109,16 +113,20 @@
109113
<reactive-streams.version>1.2.1</reactive-streams.version>
110114
<skipArchitectureTests>true</skipArchitectureTests>
111115
<skipIntegrationTests>${skipTests}</skipIntegrationTests>
112-
<checkstyle.skip>${skipTests}</checkstyle.skip>
113116

114117
<skipUnitTests>${skipTests}</skipUnitTests>
115-
<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
116118

117119
<spring-data-commons-docs.dir>../../../../spring-data-commons/src/main/asciidoc</spring-data-commons-docs.dir>
120+
<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
118121
</properties>
119122

120123
<dependencyManagement>
121124
<dependencies>
125+
<dependency>
126+
<groupId>com.google.code.findbugs</groupId>
127+
<artifactId>jsr305</artifactId>
128+
<version>3.0.2</version>
129+
</dependency>
122130
<dependency>
123131
<groupId>eu.michael-simons.neo4j</groupId>
124132
<artifactId>junit-jupiter-causal-cluster-testcontainer-extension</artifactId>
@@ -137,6 +145,11 @@
137145
<artifactId>rxjava</artifactId>
138146
<version>${rxjava2}</version>
139147
</dependency>
148+
<dependency>
149+
<groupId>jakarta.interceptor</groupId>
150+
<artifactId>jakarta.interceptor-api</artifactId>
151+
<version>${jakarta.interceptor-api.version}</version>
152+
</dependency>
140153
<dependency>
141154
<groupId>javax.xml.bind</groupId>
142155
<artifactId>jaxb-api</artifactId>
@@ -153,6 +166,11 @@
153166
<artifactId>byte-buddy-agent</artifactId>
154167
<version>${byte-buddy.version}</version>
155168
</dependency>
169+
<dependency>
170+
<groupId>net.java.dev.jna</groupId>
171+
<artifactId>jna</artifactId>
172+
<version>5.8.0</version>
173+
</dependency>
156174
<dependency>
157175
<groupId>org.apiguardian</groupId>
158176
<artifactId>apiguardian-api</artifactId>
@@ -167,6 +185,12 @@
167185
<groupId>org.neo4j</groupId>
168186
<artifactId>neo4j-cypher-dsl</artifactId>
169187
<version>${cypher-dsl.version}</version>
188+
<exclusions>
189+
<exclusion>
190+
<artifactId>annotations</artifactId>
191+
<groupId>org.jetbrains</groupId>
192+
</exclusion>
193+
</exclusions>
170194
</dependency>
171195
<dependency>
172196
<groupId>org.neo4j.driver</groupId>
@@ -183,6 +207,11 @@
183207
<artifactId>objenesis</artifactId>
184208
<version>${objenesis.version}</version>
185209
</dependency>
210+
<dependency>
211+
<groupId>org.osgi</groupId>
212+
<artifactId>org.osgi.core</artifactId>
213+
<version>6.0.0</version>
214+
</dependency>
186215
<dependency>
187216
<groupId>org.slf4j</groupId>
188217
<artifactId>slf4j-api</artifactId>
@@ -209,6 +238,18 @@
209238
<artifactId>jackson-databind</artifactId>
210239
<scope>test</scope>
211240
</dependency>
241+
<dependency>
242+
<groupId>com.querydsl</groupId>
243+
<artifactId>querydsl-core</artifactId>
244+
<version>${querydsl}</version>
245+
<scope>provided</scope>
246+
<exclusions>
247+
<exclusion>
248+
<artifactId>annotations</artifactId>
249+
<groupId>org.jetbrains</groupId>
250+
</exclusion>
251+
</exclusions>
252+
</dependency>
212253
<dependency>
213254
<groupId>eu.michael-simons.neo4j</groupId>
214255
<artifactId>junit-jupiter-causal-cluster-testcontainer-extension</artifactId>
@@ -251,32 +292,32 @@
251292
<dependency>
252293
<groupId>jakarta.transaction</groupId>
253294
<artifactId>jakarta.transaction-api</artifactId>
254-
<version>2.0.0</version>
295+
<version>${jakarta.transaction-api.version}</version>
255296
</dependency>
256297
<dependency>
257-
<groupId>org.apiguardian</groupId>
258-
<artifactId>apiguardian-api</artifactId>
298+
<groupId>org.apache.openwebbeans</groupId>
299+
<artifactId>openwebbeans-impl</artifactId>
300+
<version>${webbeans}</version>
301+
<classifier>jakarta</classifier>
302+
<scope>test</scope>
259303
</dependency>
260304
<dependency>
261305
<groupId>org.apache.openwebbeans</groupId>
262306
<artifactId>openwebbeans-se</artifactId>
263-
<classifier>jakarta</classifier>
264307
<version>${webbeans}</version>
308+
<classifier>jakarta</classifier>
265309
<scope>test</scope>
266310
</dependency>
267311
<dependency>
268312
<groupId>org.apache.openwebbeans</groupId>
269313
<artifactId>openwebbeans-spi</artifactId>
270-
<classifier>jakarta</classifier>
271314
<version>${webbeans}</version>
315+
<classifier>jakarta</classifier>
272316
<scope>test</scope>
273317
</dependency>
274318
<dependency>
275-
<groupId>org.apache.openwebbeans</groupId>
276-
<artifactId>openwebbeans-impl</artifactId>
277-
<classifier>jakarta</classifier>
278-
<version>${webbeans}</version>
279-
<scope>test</scope>
319+
<groupId>org.apiguardian</groupId>
320+
<artifactId>apiguardian-api</artifactId>
280321
</dependency>
281322
<dependency>
282323
<groupId>org.jetbrains.kotlin</groupId>
@@ -286,13 +327,13 @@
286327
<dependency>
287328
<groupId>org.jetbrains.kotlin</groupId>
288329
<artifactId>kotlin-stdlib</artifactId>
289-
<optional>true</optional>
290330
<exclusions>
291331
<exclusion>
292-
<groupId>org.jetbrains</groupId>
293332
<artifactId>annotations</artifactId>
333+
<groupId>org.jetbrains</groupId>
294334
</exclusion>
295335
</exclusions>
336+
<optional>true</optional>
296337
</dependency>
297338
<dependency>
298339
<groupId>org.jetbrains.kotlin</groupId>
@@ -354,29 +395,31 @@
354395
</exclusion>
355396
</exclusions>
356397
</dependency>
398+
<dependency>
399+
<groupId>org.testcontainers</groupId>
400+
<artifactId>neo4j</artifactId>
401+
<scope>test</scope>
402+
</dependency>
357403
<dependency>
358404
<groupId>org.testcontainers</groupId>
359405
<artifactId>testcontainers</artifactId>
360406
<scope>test</scope>
361407
<!-- Exclusion because there is a Spring Data parent dependency to a newer JUnit version -->
362408
<exclusions>
363409
<exclusion>
364-
<groupId>junit</groupId>
365410
<artifactId>junit</artifactId>
411+
<groupId>junit</groupId>
412+
</exclusion>
413+
<exclusion>
414+
<artifactId>annotations</artifactId>
415+
<groupId>org.jetbrains</groupId>
416+
</exclusion>
417+
<exclusion>
418+
<artifactId>lombok</artifactId>
419+
<groupId>org.projectlombok</groupId>
366420
</exclusion>
367421
</exclusions>
368422
</dependency>
369-
<dependency>
370-
<groupId>org.testcontainers</groupId>
371-
<artifactId>neo4j</artifactId>
372-
<scope>test</scope>
373-
</dependency>
374-
<dependency>
375-
<groupId>com.querydsl</groupId>
376-
<artifactId>querydsl-core</artifactId>
377-
<version>${querydsl}</version>
378-
<scope>provided</scope>
379-
</dependency>
380423
</dependencies>
381424

382425
<repositories>
@@ -575,6 +618,7 @@
575618
</goals>
576619
<configuration>
577620
<rules>
621+
<DependencyConvergence />
578622
<requireMavenVersion>
579623
<version>3.8.3</version>
580624
</requireMavenVersion>

0 commit comments

Comments
 (0)