Exclude sba-server-cloud from bom and starter when cloud is excluded

codecentric · May 16, 2018 · ecf99dd · ecf99dd
1 parent c2514ec
commit ecf99dd
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -168,6 +168,11 @@
                 <configuration>
                     <updatePomFile>true</updatePomFile>
                     <flattenMode>oss</flattenMode>
+                    <embedBuildProfileDependencies>true</embedBuildProfileDependencies>
+                    <pomElements>
+                        <distributionManagement>remove</distributionManagement>
+                        <repositories>remove</repositories>
+                    </pomElements>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/spring-boot-admin-build/pom.xml b/spring-boot-admin-build/pom.xml
@@ -69,6 +69,7 @@
                         <configuration>
                             <updatePomFile>true</updatePomFile>
                             <flattenMode>oss</flattenMode>
+                            <embedBuildProfileDependencies>true</embedBuildProfileDependencies>
                             <pomElements>
                                 <parent>expand</parent>
                                 <distributionManagement>remove</distributionManagement>

diff --git a/spring-boot-admin-dependencies/pom.xml b/spring-boot-admin-dependencies/pom.xml
@@ -40,11 +40,6 @@
                 <artifactId>spring-boot-admin-server-ui</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-server-cloud</artifactId>
-                <version>${revision}</version>
-            </dependency>
             <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-client</artifactId>
@@ -90,4 +85,23 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>include-cloud</id>
+            <activation>
+                <property>
+                    <name>!excludeSpringCloud</name>
+                </property>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>de.codecentric</groupId>
+                        <artifactId>spring-boot-admin-server-cloud</artifactId>
+                        <version>${revision}</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+    </profiles>
 </project>
diff --git a/spring-boot-admin-starter-server/pom.xml b/spring-boot-admin-starter-server/pom.xml
@@ -32,13 +32,28 @@
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-server</artifactId>
         </dependency>
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-server-cloud</artifactId>
-        </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-server-ui</artifactId>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>include-cloud</id>
+            <activation>
+                <property>
+                    <name>!excludeSpringCloud</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>de.codecentric</groupId>
+                    <artifactId>spring-boot-admin-server-cloud</artifactId>
+                    <!--fix for https://github.com/mojohaus/flatten-maven-plugin/issues/70 -->
+                    <version>${revision}</version>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>