From 5a4660c5eaab01d334e4f3f6c0b0743a8136917e Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Fri, 26 Jul 2019 08:32:13 -0500
Subject: [PATCH] #858 - Build BOM artifacts properly.

---
 Jenkinsfile | 9 ++++++++-
 pom.xml     | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b58e8e7c..bb7a0bdc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
 				}
 			}
 		}
-		stage('Release to artifactory') {
+		stage('Build project & BOM then release to artifactory') {
 			when {
 				anyOf {
 					branch 'master'
@@ -56,6 +56,13 @@ pipeline {
 			}
 
 			steps {
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ' +
+						'./mvnw clean dependency:tree source:jar javadoc:javadoc javadoc:jar install -pl "!bom" -B -U '
+
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean install -pl bom -B -U'
+
+				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -pl bom-client -B -U'
+				
 				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
diff --git a/pom.xml b/pom.xml
index 77b991d7..f94fb113 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,6 +172,14 @@
 			</build>
 		</profile>
 
+		<profile>
+			<id>with-bom-client</id>
+
+			<modules>
+				<module>bom-client</module>
+			</modules>
+		</profile>
+
 		<!-- Build profile for the build run to deploy to Maven Central -->
 
 		<profile>