Skip to content

Commit ced26da

Browse files
authored
Merge pull request DSpace#12427 from alanorth/ignore-micrometer-transitive
pom.xml: ignore micrometer dependencies
2 parents 7a9d8c5 + 1b95540 commit ced26da

1 file changed

Lines changed: 13 additions & 11 deletions

File tree

pom.xml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,17 +1285,19 @@
12851285
<groupId>org.springframework.ldap</groupId>
12861286
<artifactId>spring-ldap-core</artifactId>
12871287
<version>${spring-ldap.version}</version>
1288-
</dependency>
1289-
<!-- Specify the version of micrometer to use. Solves dependency convergence issues in spring-ldap-core -->
1290-
<dependency>
1291-
<groupId>io.micrometer</groupId>
1292-
<artifactId>micrometer-core</artifactId>
1293-
<version>1.14.14</version>
1294-
</dependency>
1295-
<dependency>
1296-
<groupId>io.micrometer</groupId>
1297-
<artifactId>micrometer-observation</artifactId>
1298-
<version>1.14.14</version>
1288+
<exclusions>
1289+
<!-- Ignore micrometer dependencies from spring-ldap-core because
1290+
they cause convergence issues with the version pulled in by
1291+
the main spring framework (spring.version) -->
1292+
<exclusion>
1293+
<groupId>io.micrometer</groupId>
1294+
<artifactId>micrometer-core</artifactId>
1295+
</exclusion>
1296+
<exclusion>
1297+
<groupId>io.micrometer</groupId>
1298+
<artifactId>micrometer-observation</artifactId>
1299+
</exclusion>
1300+
</exclusions>
12991301
</dependency>
13001302

13011303
<dependency>

0 commit comments

Comments
 (0)