From 81ec2f15a3edd43cff77bb3dc402216339da76d7 Mon Sep 17 00:00:00 2001
From: Gareth Clay <gclay@pivotal.io>
Date: Thu, 2 Jul 2020 12:02:31 +0100
Subject: [PATCH] Update publication config

* Allows publication to a custom maven repo, as we do in CI tasks
* Adds `SKIP_TESTS` (defaults to `false`) param for quicker testing
of CI build task with `fly execute`
---
 build.gradle                |  5 +++++
 ci/scripts/build-project.sh | 10 ++++++++--
 ci/scripts/stage.sh         |  2 +-
 ci/tasks/build-project.yml  |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 856d4e3..a92be6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -232,6 +232,11 @@ configure(publishedProjects) {
 	apply plugin: 'maven-publish'
 
 	publishing {
+		repositories {
+			maven {
+				url = project.properties.getOrDefault('publicationRepository', "${System.getenv('HOME')}/.m2/repository")
+			}
+		}
 		publications {
 			mavenJava(MavenPublication) {
 				suppressAllPomMetadataWarnings()
diff --git a/ci/scripts/build-project.sh b/ci/scripts/build-project.sh
index edead1e..7441192 100755
--- a/ci/scripts/build-project.sh
+++ b/ci/scripts/build-project.sh
@@ -3,13 +3,19 @@
 set -euo pipefail
 
 readonly ONLY_SHOW_STANDARD_STREAMS_ON_TEST_FAILURE="${ONLY_SHOW_STANDARD_STREAMS_ON_TEST_FAILURE:-true}"
+readonly SKIP_TESTS="${SKIP_TESTS:-false}"
 
 # shellcheck source=common.sh
 source "$(dirname "$0")/common.sh"
 repository=$(pwd)/distribution-repository
+if [ "$SKIP_TESTS" == "true" ]; then
+	build_task=assemble
+else
+	build_task=build
+fi
 
 pushd git-repo >/dev/null
-./gradlew --parallel clean build install \
+./gradlew --parallel clean "$build_task" publish \
 	-PonlyShowStandardStreamsOnTestFailure="${ONLY_SHOW_STANDARD_STREAMS_ON_TEST_FAILURE}" \
-	-Dmaven.repo.local="${repository}"
+	-PpublicationRepository="${repository}"
 popd >/dev/null
diff --git a/ci/scripts/stage.sh b/ci/scripts/stage.sh
index 41c8a44..801de82 100755
--- a/ci/scripts/stage.sh
+++ b/ci/scripts/stage.sh
@@ -37,7 +37,7 @@ git commit -m "Release v$stageVersion"
 git tag -a "v$stageVersion" -m "Release v$stageVersion"
 echo
 
-./gradlew --no-daemon clean install -Dmaven.repo.local="${repository}"
+./gradlew clean publish -PpublicationRepository="${repository}"
 echo
 
 echo "Setting next development version (v$nextVersion)"
diff --git a/ci/tasks/build-project.yml b/ci/tasks/build-project.yml
index 08389b0..7ac086f 100644
--- a/ci/tasks/build-project.yml
+++ b/ci/tasks/build-project.yml
@@ -16,3 +16,4 @@ run:
   path: git-repo/ci/scripts/build-project.sh
 params:
   ONLY_SHOW_STANDARD_STREAMS_ON_TEST_FAILURE: true
+  SKIP_TESTS: false