From 86ffe5c20e0561e0f449f1deb8158ada8377c597 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Tue, 11 Jan 2022 15:32:08 -0700 Subject: [PATCH] Add ldif-core to build Issue gh-610 --- dependencies/build.gradle | 1 + ldif/ldif-core/build.gradle | 11 +++++++---- settings.gradle | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dependencies/build.gradle b/dependencies/build.gradle index 2a0eadb4..f4f651be 100644 --- a/dependencies/build.gradle +++ b/dependencies/build.gradle @@ -35,6 +35,7 @@ dependencies { api "com.unboundid:unboundid-ldapsdk:4.0.14" api "commons-codec:commons-codec:1.15" api "commons-collections:commons-collections:3.2.2" + api "commons-io:commons-io:2.11.0" api "commons-lang:commons-lang:2.6" api "commons-logging:commons-logging:1.2" api "gsbase:gsbase:2.0.1" diff --git a/ldif/ldif-core/build.gradle b/ldif/ldif-core/build.gradle index 852bc21b..3d5bd9ea 100644 --- a/ldif/ldif-core/build.gradle +++ b/ldif/ldif-core/build.gradle @@ -3,12 +3,15 @@ plugins { } dependencies { + management platform(project(":spring-ldap-dependencies")) implementation project(":spring-ldap-core") - testImplementation "junit:junit", - "commons-io:commons-io", - "org.assertj:assertj-core" - testImplementation ("log4j:log4j") { + testImplementation platform('org.junit:junit-bom') + testImplementation "org.junit.vintage:junit-vintage-engine" + testImplementation "junit:junit" + testImplementation "commons-io:commons-io" + testImplementation "org.assertj:assertj-core" + testImplementation ("log4j:log4j:1.2.17") { exclude group: 'javax.jms' exclude group: 'com.sun.jdmk' exclude group: 'com.sun.jmx' diff --git a/settings.gradle b/settings.gradle index 07c2d54e..642fc989 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,7 +25,7 @@ include 'core' include 'core-tiger' include 'dependencies' //include 'test-support' -//include 'ldif/ldif-core' +include 'ldif/ldif-core' //include 'odm' ////include 'sandbox' //include 'test/integration-tests'