From ecf99dd6031d083471498de9c9cc3817cd79ae5c Mon Sep 17 00:00:00 2001 From: Johannes Edmeier Date: Wed, 16 May 2018 21:49:28 +0200 Subject: [PATCH] Exclude sba-server-cloud from bom and starter when cloud is excluded --- pom.xml | 5 +++++ spring-boot-admin-build/pom.xml | 1 + spring-boot-admin-dependencies/pom.xml | 24 +++++++++++++++++++----- spring-boot-admin-starter-server/pom.xml | 23 +++++++++++++++++++---- 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 03b7ab86791..b8d9b1dab2e 100644 --- a/pom.xml +++ b/pom.xml @@ -168,6 +168,11 @@ true oss + true + + remove + remove + diff --git a/spring-boot-admin-build/pom.xml b/spring-boot-admin-build/pom.xml index 75ff6c12242..e7a976e3186 100644 --- a/spring-boot-admin-build/pom.xml +++ b/spring-boot-admin-build/pom.xml @@ -69,6 +69,7 @@ true oss + true expand remove diff --git a/spring-boot-admin-dependencies/pom.xml b/spring-boot-admin-dependencies/pom.xml index 097a37333a9..47df731dea8 100644 --- a/spring-boot-admin-dependencies/pom.xml +++ b/spring-boot-admin-dependencies/pom.xml @@ -40,11 +40,6 @@ spring-boot-admin-server-ui ${revision} - - de.codecentric - spring-boot-admin-server-cloud - ${revision} - de.codecentric spring-boot-admin-client @@ -90,4 +85,23 @@ + + + include-cloud + + + !excludeSpringCloud + + + + + + de.codecentric + spring-boot-admin-server-cloud + ${revision} + + + + + diff --git a/spring-boot-admin-starter-server/pom.xml b/spring-boot-admin-starter-server/pom.xml index b9dc47a5c14..109c4783921 100644 --- a/spring-boot-admin-starter-server/pom.xml +++ b/spring-boot-admin-starter-server/pom.xml @@ -32,13 +32,28 @@ de.codecentric spring-boot-admin-server - - de.codecentric - spring-boot-admin-server-cloud - de.codecentric spring-boot-admin-server-ui + + + include-cloud + + + !excludeSpringCloud + + + + + de.codecentric + spring-boot-admin-server-cloud + + ${revision} + compile + + + +