Skip to content

Commit 8f73a14

Browse files
authored
Merge pull request #113 from AricMonary/issue-1846v2
Backport the fixes related to replacing ApacheDS with UnboundID from pull #1783 to the master #1846 And Upgrade our UnboundID dependencies from 4.0.9 to 5.1.1 #1858
2 parents f971af6 + 6a707f7 commit 8f73a14

File tree

1 file changed

+7
-25
lines changed

1 file changed

+7
-25
lines changed

pom.xml

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363

6464
<version.apache.commons.io>2.6</version.apache.commons.io>
6565
<version.apache.commons.compress>1.19</version.apache.commons.compress>
66-
<version.apache.directory>1.5.5</version.apache.directory>
6766
<version.appassembler>2.1.0</version.appassembler>
6867
<version.groovy>2.4.7</version.groovy>
6968
<version.guava>27.0.1-jre</version.guava>
@@ -605,6 +604,12 @@
605604
<!-- Override for transitive dependencies which bring older vulnerable
606605
versions of the commons-beanutils:commons-beanutils in order to not be exposed
607606
to: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-0114 -->
607+
<dependency>
608+
<groupId>com.unboundid</groupId>
609+
<artifactId>unboundid-ldapsdk</artifactId>
610+
<version>5.1.1</version>
611+
<scope>test</scope>
612+
</dependency>
608613
<dependency>
609614
<groupId>commons-beanutils</groupId>
610615
<artifactId>commons-beanutils</artifactId>
@@ -1039,30 +1044,7 @@
10391044
<version>2.4.4</version>
10401045
</dependency>
10411046

1042-
<dependency>
1043-
<groupId>org.apache.directory.server</groupId>
1044-
<artifactId>apacheds-core</artifactId>
1045-
<version>${version.apache.directory}</version>
1046-
<scope>test</scope>
1047-
<exclusions>
1048-
<exclusion>
1049-
<groupId>org.slf4j</groupId>
1050-
<artifactId>slf4j-api</artifactId>
1051-
</exclusion>
1052-
</exclusions>
1053-
</dependency>
1054-
<dependency>
1055-
<groupId>org.apache.directory.server</groupId>
1056-
<artifactId>apacheds-protocol-ldap</artifactId>
1057-
<version>${version.apache.directory}</version>
1058-
<scope>test</scope>
1059-
<exclusions>
1060-
<exclusion>
1061-
<groupId>org.slf4j</groupId>
1062-
<artifactId>slf4j-api</artifactId>
1063-
</exclusion>
1064-
</exclusions>
1065-
</dependency>
1047+
10661048

10671049
<dependency>
10681050
<groupId>org.javatuples</groupId>

0 commit comments

Comments
 (0)