Skip to content

Commit c9a56b5

Browse files
committed
Handle org.apache.directory.server dependencies for now
1 parent 3956a65 commit c9a56b5

File tree

1 file changed

+39
-5
lines changed

1 file changed

+39
-5
lines changed

settings.gradle

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,25 +175,59 @@ dependencyResolutionManagement {
175175

176176
// org.apache.directory.api:api-asn1-ber brings in org.slf4j:slf4j-api:1.7.25. We use 2.0.6
177177
// TODO: For org.apache.directory.api dependencies we use partially 1.0.1 and partially 1.0.0. We should align these.
178-
withModule("org.apache.directory.api:api-util", ExcludeTransitivesRule)
178+
withModule("org.apache.directory.api:api-util", ExcludeTransitivesRule)
179179

180180
withModule("org.apache.directory.jdbm:apacheds-jdbm1", ExcludeTransitivesRule)
181181
withModule("org.apache.directory.mavibot:mavibot", ExcludeTransitivesRule)
182+
// org.apache.directory.server:apacheds-core-annotations brings in org.apache.directory.api:api-ldap-model:1.0.0. We use 1.0.1.
183+
// org.apache.directory.server:apacheds-core-annotations brings in org.apache.directory.api:api-util:1.0.0. We use 1.0.1.
182184
withModule("org.apache.directory.server:apacheds-core-annotations", ExcludeTransitivesRule)
185+
186+
// brings in org.slf4j:slf4j-api:1.7.25. We use 2.0.6
187+
withModule("org.apache.directory.server:apacheds-core", ExcludeTransitivesRule)
188+
// brings in org.apache.directory.server:apacheds-core:2.0.0-M24
189+
withModule("org.apache.directory.server:apacheds-interceptor-kerberos", ExcludeTransitivesRule)
190+
withModule("org.apache.directory.server:apacheds-core-shared", ExcludeTransitiveOtherGroupsRule)
191+
// brings in org.apache.directory.server:apacheds-core-shared:2.0.0-M24
192+
withModule("org.apache.directory.server:apacheds-ldif-partition", ExcludeTransitivesRule)
193+
withModule("org.apache.directory.server:apacheds-protocol-shared", ExcludeTransitiveOtherGroupsRule)
194+
withModule("org.apache.directory.server:ldap-client-test", ExcludeTransitiveOtherGroupsRule)
195+
196+
// org.apache.directory.server:apacheds-core-api brings in org.apache.directory.api:api-asn1-api:1.0.0. We use 1.0.1.
197+
// org.apache.directory.server:apacheds-core-api brings in org.apache.directory.api:api-i18n:1.0.0. We use 1.0.1.
198+
// org.apache.directory.server:apacheds-core-api brings in org.apache.directory.api:api-ldap-model:1.0.0. We use 1.0.1.
199+
// org.apache.directory.server:apacheds-core-api brings in org.apache.directory.api:api-util:1.0.0. We use 1.0.1.
183200
withModule("org.apache.directory.server:apacheds-core-api", ExcludeTransitivesRule)
184201
withModule("org.apache.directory.server:apacheds-i18n", ExcludeTransitivesRule)
185-
withModule("org.apache.directory.server:apacheds-interceptor-kerberos", ExcludeTransitivesRule)
202+
// org.apache.directory.server:apacheds-jdbm-partition brings in org.apache.directory.api:api-ldap-model:1.0.0. We use 1.0.1.
203+
// org.apache.directory.server:apacheds-jdbm-partition brings in org.apache.directory.api:api-util:1.0.0. We use 1.0.1.
186204
withModule("org.apache.directory.server:apacheds-jdbm-partition", ExcludeTransitivesRule)
205+
// org.apache.directory.server:apacheds-kerberos-codec brings in org.apache.directory.api:api-asn1-api:1.0.0. We use 1.0.1.
206+
// org.apache.directory.server:apacheds-kerberos-codec brings in org.apache.directory.api:api-asn1-ber:1.0.0. We use 1.0.1.
207+
// org.apache.directory.server:apacheds-kerberos-codec brings in org.apache.directory.api:api-i18n:1.0.0. We use 1.0.1.
208+
// org.apache.directory.server:apacheds-kerberos-codec brings in org.apache.directory.api:api-ldap-model:1.0.0. We use 1.0.1.
209+
// org.apache.directory.server:apacheds-kerberos-codec brings in org.apache.directory.api:api-util:1.0.0. We use 1.0.1.
187210
withModule("org.apache.directory.server:apacheds-kerberos-codec", ExcludeTransitivesRule)
188-
withModule("org.apache.directory.server:apacheds-ldif-partition", ExcludeTransitivesRule)
211+
// org.apache.directory.server:apacheds-mavibot-partition brings in org.apache.directory.api:api-ldap-model:1.0.0. We use 1.0.1.
212+
// org.apache.directory.server:apacheds-mavibot-partition brings in org.apache.directory.api:api-util:1.0.0. We use 1.0.1.
189213
withModule("org.apache.directory.server:apacheds-mavibot-partition", ExcludeTransitivesRule)
214+
// org.apache.directory.server:apacheds-protocol-kerberos brings in org.apache.directory.api:api-asn1-api:1.0.0. We use 1.0.1.
215+
// org.apache.directory.server:apacheds-protocol-kerberos brings in org.apache.directory.api:api-ldap-model:1.0.0. We use 1.0.1.
190216
withModule("org.apache.directory.server:apacheds-protocol-kerberos", ExcludeTransitivesRule)
217+
// org.apache.directory.server:apacheds-protocol-ldap brings in org.apache.directory.api:api-asn1-ber:1.0.0. We use 1.0.1.
218+
// org.apache.directory.server:apacheds-protocol-ldap brings in org.apache.directory.api:api-ldap-model:1.0.0. We use 1.0.1.
219+
// org.apache.directory.server:apacheds-protocol-ldap brings in org.apache.directory.api:api-util:1.0.0. We use 1.0.1.
191220
withModule("org.apache.directory.server:apacheds-protocol-ldap", ExcludeTransitivesRule)
192-
withModule("org.apache.directory.server:apacheds-protocol-shared", ExcludeTransitivesRule)
221+
// org.apache.directory.server:apacheds-server-annotations brings in org.apache.directory.api:api-ldap-model:1.0.0. We use 1.0.1.
193222
withModule("org.apache.directory.server:apacheds-server-annotations", ExcludeTransitivesRule)
223+
// org.apache.directory.server:apacheds-test-framework brings in org.apache.directory.api:api-ldap-model:1.0.0. We use 1.0.1.
194224
withModule("org.apache.directory.server:apacheds-test-framework", ExcludeTransitivesRule)
225+
// org.apache.directory.server:apacheds-xdbm-partition brings in org.apache.directory.api:api-ldap-model:1.0.0. We use 1.0.1.
226+
// org.apache.directory.server:apacheds-xdbm-partition brings in org.apache.directory.api:api-util:1.0.0. We use 1.0.1.
195227
withModule("org.apache.directory.server:apacheds-xdbm-partition", ExcludeTransitivesRule)
196-
withModule("org.apache.directory.server:ldap-client-test", ExcludeTransitivesRule)
228+
229+
// org.apache.directory.api:api-ldap-client-api brings in org.apache.mina:mina-core:2.0.16. We use 2.2.4
230+
withModule("org.apache.directory.server:apacheds-interceptors-authn", ExcludeTransitivesRule)
197231

198232
withModule("org.apache.hadoop:hadoop-client-api", ExcludeTransitivesRule)
199233
withModule("org.apache.hadoop:hadoop-client-runtime", ExcludeTransitivesRule)

0 commit comments

Comments
 (0)