From 7afbb242bdc6f8ddfb26b1e8b676468691df11c7 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 14 Jan 2022 08:37:12 -0700 Subject: [PATCH] Use api configuration Closes gh-616 --- core-tiger/build.gradle | 4 ++-- core/build.gradle | 9 +++++---- ldif/ldif-core/build.gradle | 2 +- odm/build.gradle | 13 +++++++------ sandbox/build.gradle | 2 +- test-support/build.gradle | 19 ++++++++++--------- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/core-tiger/build.gradle b/core-tiger/build.gradle index 1716be5c..6995c7c4 100644 --- a/core-tiger/build.gradle +++ b/core-tiger/build.gradle @@ -4,8 +4,8 @@ plugins { dependencies { management platform(project(":spring-ldap-dependencies")) - implementation project(":spring-ldap-core"), - "org.springframework:spring-tx" + api project(":spring-ldap-core") + api "org.springframework:spring-tx" testImplementation platform('org.junit:junit-bom') testImplementation "org.junit.vintage:junit-vintage-engine" diff --git a/core/build.gradle b/core/build.gradle index 38883026..8343c9d5 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -14,9 +14,11 @@ javacc { dependencies { management platform(project(":spring-ldap-dependencies")) - implementation "org.springframework:spring-core" - implementation "org.springframework:spring-beans" - implementation "org.springframework:spring-tx" + api "org.springframework:spring-core" + api "org.springframework:spring-beans" + api "org.springframework:spring-tx" + + implementation "jakarta.xml.bind:jakarta.xml.bind-api" implementation "org.slf4j:slf4j-api" provided "com.sun:ldapbp:1.0" @@ -28,7 +30,6 @@ dependencies { optional "com.querydsl:querydsl-apt" optional "commons-pool:commons-pool" optional "org.apache.commons:commons-pool2" - implementation 'jakarta.xml.bind:jakarta.xml.bind-api' testImplementation platform('org.junit:junit-bom') testImplementation "org.junit.vintage:junit-vintage-engine" diff --git a/ldif/ldif-core/build.gradle b/ldif/ldif-core/build.gradle index 3d5bd9ea..e42ede08 100644 --- a/ldif/ldif-core/build.gradle +++ b/ldif/ldif-core/build.gradle @@ -4,7 +4,7 @@ plugins { dependencies { management platform(project(":spring-ldap-dependencies")) - implementation project(":spring-ldap-core") + api project(":spring-ldap-core") testImplementation platform('org.junit:junit-bom') testImplementation "org.junit.vintage:junit-vintage-engine" diff --git a/odm/build.gradle b/odm/build.gradle index 5990f7e4..48a98931 100644 --- a/odm/build.gradle +++ b/odm/build.gradle @@ -8,12 +8,13 @@ jar { dependencies { management platform(project(":spring-ldap-dependencies")) - implementation project(":spring-ldap-core"), - project(":spring-ldap-core-tiger"), - "org.springframework:spring-core", - "org.freemarker:freemarker", - "commons-logging:commons-logging", - "commons-cli:commons-cli" + api project(":spring-ldap-core") + api project(":spring-ldap-core-tiger") + api "org.springframework:spring-core" + + implementation "org.freemarker:freemarker" + implementation "commons-logging:commons-logging" + implementation "commons-cli:commons-cli" runtimeOnly "org.springframework:spring-context" diff --git a/sandbox/build.gradle b/sandbox/build.gradle index aa68789d..1a2f9a7f 100644 --- a/sandbox/build.gradle +++ b/sandbox/build.gradle @@ -4,7 +4,7 @@ plugins { dependencies { management platform(project(":spring-ldap-dependencies")) - implementation project(":spring-ldap-core") + api project(":spring-ldap-core") provided "com.sun:ldapbp:1.0" diff --git a/test-support/build.gradle b/test-support/build.gradle index dd6acbff..4fbafb80 100644 --- a/test-support/build.gradle +++ b/test-support/build.gradle @@ -4,15 +4,16 @@ plugins { dependencies { management platform(project(":spring-ldap-dependencies")) - implementation project(":spring-ldap-core"), - project(":spring-ldap-ldif-core"), - "com.google.code.typica:typica", - "commons-io:commons-io", - "javax.activation:activation", - "org.springframework:spring-core", - "org.springframework:spring-beans", - "org.springframework:spring-context", - "org.springframework:spring-test" + api project(":spring-ldap-core") + api project(":spring-ldap-ldif-core") + api "org.springframework:spring-core" + api "org.springframework:spring-beans" + api "org.springframework:spring-context" + api "org.springframework:spring-test" + + implementation "com.google.code.typica:typica" + implementation "commons-io:commons-io" + implementation "javax.activation:activation" optional "org.apache.directory.server:apacheds-core-entry"