From e78a0741d9038e62398e81104eb2bd776b2f53c9 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Fri, 13 Oct 2017 16:53:20 -0500
Subject: [PATCH] SWS-998 - Fix artifactory deployment

---
 deploy.bash | 2 +-
 pom.xml     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/deploy.bash b/deploy.bash
index a1dfeb7d..d4b669a9 100755
--- a/deploy.bash
+++ b/deploy.bash
@@ -1,7 +1,7 @@
 #!/bin/bash -x
 
 if [ "${CIRCLE_BRANCH}" == "master" ] || [ "${CIRCLE_BRANCH}" == "2.x" ]; then
-	./mvnw -Pdistribute,snapshot,docs clean deploy
+	./mvnw -Pdistribute,snapshot,docs clean -Dmaven.test.skip=true deploy
 else
 	echo "We only deploy 'master' and '2.x' branches"
 fi
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 31cc5cfd..a3fdf510 100644
--- a/pom.xml
+++ b/pom.xml
@@ -508,6 +508,7 @@
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
 						<version>1.10</version>
+						<inherited>false</inherited>
 						<executions>
 							<execution>
 								<id>attach-zip</id>